diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BowidickService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BowidickService.java index 109212d4..fdfd74f9 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BowidickService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BowidickService.java @@ -5,7 +5,7 @@ import com.jasamedika.medifirst2000.vo.BowidickVO; import java.util.Map; public interface BowidickService { - Map saveBowidick(BowidickVO dto); + Map saveBowidick(BowidickVO vo); Map getBowidick(String startDate, String endDate); Map getBowidickbyNorec(String noRec); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestEntylenOxideService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestEntylenOxideService.java index 4b830f69..36d671d7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestEntylenOxideService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestEntylenOxideService.java @@ -5,6 +5,6 @@ import com.jasamedika.medifirst2000.vo.MonitoringTestEthylenOxideVO; import java.util.Map; public interface MonitoringTestEntylenOxideService { - Map saveMonitoringTestEntylenOxideService(MonitoringTestEthylenOxideVO dto); + Map saveMonitoringTestEntylenOxideService(MonitoringTestEthylenOxideVO vo); Map getMonitoringTestEntylenOxideService(String startDate, String endDate); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestmesinAutoClaveService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestmesinAutoClaveService.java index 72523257..efa67e9b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestmesinAutoClaveService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MonitoringTestmesinAutoClaveService.java @@ -5,7 +5,7 @@ import com.jasamedika.medifirst2000.vo.MonitoringTestMesinAutoclaveVO; import java.util.Map; public interface MonitoringTestmesinAutoClaveService { - Map saveMonitoringTestMesinAutoClave(MonitoringTestMesinAutoclaveVO dto); + Map saveMonitoringTestMesinAutoClave(MonitoringTestMesinAutoclaveVO vo); Map getMonitoringTestMesinAutoClave(String startDate, String endDate); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/StandarPelayananMakananService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/StandarPelayananMakananService.java index 78bfe612..c862197c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/StandarPelayananMakananService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/StandarPelayananMakananService.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; public interface StandarPelayananMakananService { - List> save(List dtos); + List> save(List vos); Map getStandarPelayananMakanan(); Map getRuangan(); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BowidickServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BowidickServiceImpl.java index 2fa9f242..acde62df 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BowidickServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BowidickServiceImpl.java @@ -30,65 +30,65 @@ public class BowidickServiceImpl implements BowidickService { @Override - public Map saveBowidick(BowidickVO dto) { + public Map saveBowidick(BowidickVO vo) { Map result = new HashMap<>(); PencatatanSuhuMesin pencatatanSuhuMesin = new PencatatanSuhuMesin(); - pencatatanSuhuMesin.setNoRec(dto.getPencatatanMesinNoRec()); - Mesin mesin = this.mesinDao.findOne(dto.getMesinId()); + pencatatanSuhuMesin.setNoRec(vo.getPencatatanMesinNoRec()); + Mesin mesin = this.mesinDao.findOne(vo.getMesinId()); pencatatanSuhuMesin.setMesin(mesin); - Pegawai petugas = this.pegawaiDao.findById(dto.getPetugasId()); + Pegawai petugas = this.pegawaiDao.findById(vo.getPetugasId()); pencatatanSuhuMesin.setPetugas(petugas); - pencatatanSuhuMesin.setTanggal(dto.getTanggal()); - pencatatanSuhuMesin.setProgramMesin(dto.getProgramMesin()); - pencatatanSuhuMesin.setSuhu(dto.getSuhu()); - pencatatanSuhuMesin.setTekanan(dto.getTekanan()); - pencatatanSuhuMesin.setWaktuMulai(dto.getWaktuMulai()); - pencatatanSuhuMesin.setWaktuSelesai(dto.getWaktuSelesai()); - pencatatanSuhuMesin.setLamaProses(dto.getLamaProses()); + pencatatanSuhuMesin.setTanggal(vo.getTanggal()); + pencatatanSuhuMesin.setProgramMesin(vo.getProgramMesin()); + pencatatanSuhuMesin.setSuhu(vo.getSuhu()); + pencatatanSuhuMesin.setTekanan(vo.getTekanan()); + pencatatanSuhuMesin.setWaktuMulai(vo.getWaktuMulai()); + pencatatanSuhuMesin.setWaktuSelesai(vo.getWaktuSelesai()); + pencatatanSuhuMesin.setLamaProses(vo.getLamaProses()); pencatatanSuhuMesin.setKeterangan("Bowidick"); pencatatanSuhuMesin.setStatusEnabled(true); PencatatanSuhuMesin PencatatanSuhuMesinResult = this.pencatatanSuhuMesinDao.save(pencatatanSuhuMesin); if(CommonUtil.isNotNullOrEmpty(PencatatanSuhuMesinResult)) { Bowidick bowidick = new Bowidick(); - bowidick.setNoRec(dto.getBowidickNoRec()); + bowidick.setNoRec(vo.getBowidickNoRec()); bowidick.setPencatatanSuhuMesin(pencatatanSuhuMesin); bowidick.setMesin(mesin); - bowidick.setProgramMesin(dto.getProgramMesin()); - bowidick.setHasil(dto.getHasil()); - bowidick.setSuhu(dto.getSuhu()); - bowidick.setTanggal(dto.getTanggalBowidick()); - Pegawai operator = this.pegawaiDao.findById(dto.getOperatorId()); + bowidick.setProgramMesin(vo.getProgramMesin()); + bowidick.setHasil(vo.getHasil()); + bowidick.setSuhu(vo.getSuhu()); + bowidick.setTanggal(vo.getTanggalBowidick()); + Pegawai operator = this.pegawaiDao.findById(vo.getOperatorId()); bowidick.setOperator(operator); - Pegawai supervisor = this.pegawaiDao.findById(dto.getSupervisorId()); + Pegawai supervisor = this.pegawaiDao.findById(vo.getSupervisorId()); bowidick.setSupervisor(supervisor); bowidick = this.bowidickDao.save(bowidick); BiologicalSudahDisterile biologicalSudahDisterile = new BiologicalSudahDisterile(); - biologicalSudahDisterile.setNoRec(dto.getBiologicalNoRec()); + biologicalSudahDisterile.setNoRec(vo.getBiologicalNoRec()); biologicalSudahDisterile.setPencatatanSuhuMesin(pencatatanSuhuMesin); - biologicalSudahDisterile.setTanggal(dto.getTanggalBiological()); - Pegawai operatorBiological = this.pegawaiDao.findById(dto.getOperatorBiologicalId()); + biologicalSudahDisterile.setTanggal(vo.getTanggalBiological()); + Pegawai operatorBiological = this.pegawaiDao.findById(vo.getOperatorBiologicalId()); biologicalSudahDisterile.setOperator(operatorBiological); - biologicalSudahDisterile.setSuhuPensterilan(dto.getSuhuPensterilan()); - biologicalSudahDisterile.setSuhuIncubator(dto.getSuhuIncubator()); - biologicalSudahDisterile.setHasil(dto.getHasilBiological()); - biologicalSudahDisterile.setJamMasuk(dto.getJamMasukBiological()); - biologicalSudahDisterile.setJamKeluar(dto.getJamKeluarBiological()); + biologicalSudahDisterile.setSuhuPensterilan(vo.getSuhuPensterilan()); + biologicalSudahDisterile.setSuhuIncubator(vo.getSuhuIncubator()); + biologicalSudahDisterile.setHasil(vo.getHasilBiological()); + biologicalSudahDisterile.setJamMasuk(vo.getJamMasukBiological()); + biologicalSudahDisterile.setJamKeluar(vo.getJamKeluarBiological()); biologicalSudahDisterile.setKeterangan("Biological"); biologicalSudahDisterile = this.biologicalSudahDisterileDao.save(biologicalSudahDisterile); BiologicalSudahDisterile attestPembanding = new BiologicalSudahDisterile(); - attestPembanding.setNoRec(dto.getAttestPembandingNoRec()); + attestPembanding.setNoRec(vo.getAttestPembandingNoRec()); attestPembanding.setPencatatanSuhuMesin(pencatatanSuhuMesin); - attestPembanding.setTanggal(dto.getTanggalAttest()); - Pegawai operatorAttest = this.pegawaiDao.findById(dto.getOperatorAttestId()); + attestPembanding.setTanggal(vo.getTanggalAttest()); + Pegawai operatorAttest = this.pegawaiDao.findById(vo.getOperatorAttestId()); attestPembanding.setOperator(operatorAttest); - attestPembanding.setSuhuPensterilan(dto.getSuhuPensterilanAttest()); - attestPembanding.setSuhuIncubator(dto.getSuhuIncubatorAttest()); - attestPembanding.setHasil(dto.getHasilAttest()); - attestPembanding.setJamMasuk(dto.getJamMasukAttest()); - attestPembanding.setJamKeluar(dto.getJamKeluarAttest()); + attestPembanding.setSuhuPensterilan(vo.getSuhuPensterilanAttest()); + attestPembanding.setSuhuIncubator(vo.getSuhuIncubatorAttest()); + attestPembanding.setHasil(vo.getHasilAttest()); + attestPembanding.setJamMasuk(vo.getJamMasukAttest()); + attestPembanding.setJamKeluar(vo.getJamKeluarAttest()); attestPembanding.setKeterangan("Attest"); attestPembanding = this.biologicalSudahDisterileDao.save(attestPembanding); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestEntylenOxideServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestEntylenOxideServiceImpl.java index e7c5fd40..bdbe2bfd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestEntylenOxideServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestEntylenOxideServiceImpl.java @@ -21,18 +21,18 @@ public class MonitoringTestEntylenOxideServiceImpl implements MonitoringTestEnty private PegawaiDao pegawaiDao; @Override - public Map saveMonitoringTestEntylenOxideService(MonitoringTestEthylenOxideVO dto) { + public Map saveMonitoringTestEntylenOxideService(MonitoringTestEthylenOxideVO vo) { Map result = new HashMap<>(); MonitoringTestEthylenOxide monitoringTestEthylenOxide = new MonitoringTestEthylenOxide(); - monitoringTestEthylenOxide.setNoRec(dto.getNoRec()); - monitoringTestEthylenOxide.setTanggalMulai(dto.getTanggalMulai()); - monitoringTestEthylenOxide.setTanggalSelesai(dto.getTanggalSelesai()); - monitoringTestEthylenOxide.setJamMulai(dto.getJamMulai()); - monitoringTestEthylenOxide.setJamSelesai(dto.getJamSelesai()); - monitoringTestEthylenOxide.setPemeriksaan(dto.getPemeriksaan()); - monitoringTestEthylenOxide.setStatusEnabled(dto.getStatusEnabled()); - Pegawai petugas = this.pegawaiDao.findById(dto.getPetugasId()); + monitoringTestEthylenOxide.setNoRec(vo.getNoRec()); + monitoringTestEthylenOxide.setTanggalMulai(vo.getTanggalMulai()); + monitoringTestEthylenOxide.setTanggalSelesai(vo.getTanggalSelesai()); + monitoringTestEthylenOxide.setJamMulai(vo.getJamMulai()); + monitoringTestEthylenOxide.setJamSelesai(vo.getJamSelesai()); + monitoringTestEthylenOxide.setPemeriksaan(vo.getPemeriksaan()); + monitoringTestEthylenOxide.setStatusEnabled(vo.getStatusEnabled()); + Pegawai petugas = this.pegawaiDao.findById(vo.getPetugasId()); monitoringTestEthylenOxide.setPetugas(petugas); MonitoringTestEthylenOxide monitoringTestEthylenOxideResult = this.monitoringTestEntylenOxideDao.save(monitoringTestEthylenOxide); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestmesinAutoClaveServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestmesinAutoClaveServiceImpl.java index 635f9406..3a98cca5 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestmesinAutoClaveServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringTestmesinAutoClaveServiceImpl.java @@ -26,20 +26,20 @@ public class MonitoringTestmesinAutoClaveServiceImpl implements MonitoringTestme private PegawaiDao pegawaiDao; @Override - public Map saveMonitoringTestMesinAutoClave(MonitoringTestMesinAutoclaveVO dto) { + public Map saveMonitoringTestMesinAutoClave(MonitoringTestMesinAutoclaveVO vo) { Map result = new HashMap<>(); MonitoringTestMesinAutoclave monitoringTestMesinAutoclave = new MonitoringTestMesinAutoclave(); - monitoringTestMesinAutoclave.setNoRec(dto.getNoRec()); - monitoringTestMesinAutoclave.setTanggal(dto.getTanggal()); - monitoringTestMesinAutoclave.setJamMasuk(dto.getJamMasuk()); - monitoringTestMesinAutoclave.setJamKeluar(dto.getJamKeluar()); - monitoringTestMesinAutoclave.setPemeriksaan(dto.getPemeriksaan()); - monitoringTestMesinAutoclave.setKeterangan(dto.getKeterangan()); - monitoringTestMesinAutoclave.setSuhu(dto.getSuhu()); - monitoringTestMesinAutoclave.setStatusEnabled(dto.getStatusEnabled()); - Mesin mesin = this.mesinDao.findOne(dto.getMesinId()); + monitoringTestMesinAutoclave.setNoRec(vo.getNoRec()); + monitoringTestMesinAutoclave.setTanggal(vo.getTanggal()); + monitoringTestMesinAutoclave.setJamMasuk(vo.getJamMasuk()); + monitoringTestMesinAutoclave.setJamKeluar(vo.getJamKeluar()); + monitoringTestMesinAutoclave.setPemeriksaan(vo.getPemeriksaan()); + monitoringTestMesinAutoclave.setKeterangan(vo.getKeterangan()); + monitoringTestMesinAutoclave.setSuhu(vo.getSuhu()); + monitoringTestMesinAutoclave.setStatusEnabled(vo.getStatusEnabled()); + Mesin mesin = this.mesinDao.findOne(vo.getMesinId()); monitoringTestMesinAutoclave.setMesin(mesin); - Pegawai petugas = this.pegawaiDao.findById(dto.getPetugasId()); + Pegawai petugas = this.pegawaiDao.findById(vo.getPetugasId()); monitoringTestMesinAutoclave.setPetugas(petugas); MonitoringTestMesinAutoclave monitoringTestMesinAutoclaveResult = this.monitoringTestMesinAutoclaveDao.save(monitoringTestMesinAutoclave); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StandarPelayananMakananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StandarPelayananMakananServiceImpl.java index 1138f7eb..f9595a8b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StandarPelayananMakananServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StandarPelayananMakananServiceImpl.java @@ -32,10 +32,10 @@ public class StandarPelayananMakananServiceImpl implements StandarPelayananMakan private SatuanStandarDao satuanStandarDao; @Override - public List> save(List dtos) { + public List> save(List vos) { Map result = new HashMap<>(); List> listMap = new ArrayList<>(); - for(StandarPelayananMakananVO dto:dtos){ + for(StandarPelayananMakananVO dto: vos){ StandarPelayananMakanan standarPelayananMakanan = new StandarPelayananMakanan(); standarPelayananMakanan.setId(dto.getId()); Ruangan ruangan = this.ruanganDao.findById(dto.getRuanganId()); diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java index c58735e0..010f699f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.AdmisiRencanaPindahRuanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class AdmisiRencanaPindahRuanganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +66,11 @@ public class AgamaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return RestUtil.getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -83,11 +83,11 @@ public class AgamaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when delete", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return RestUtil.getJsonHttpStatus(NOT_ACCEPTABLE); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java index 603fd34d..eacbe82a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.AlatDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.AlatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AlatVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class AlatController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllAlat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllAlat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -64,7 +63,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-mesin-cuci", method = GET, produces = APPLICATION_JSON_VALUE) @@ -74,7 +73,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-mesin-aset", method = GET, produces = APPLICATION_JSON_VALUE) @@ -84,7 +83,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-satuan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -94,7 +93,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-departemen-laundry", method = GET, produces = APPLICATION_JSON_VALUE) @@ -104,7 +103,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-max-no-mesin", method = GET, produces = APPLICATION_JSON_VALUE) @@ -114,7 +113,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-produkasetid-alatid", method = GET, produces = APPLICATION_JSON_VALUE) @@ -126,7 +125,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-asset-laundry", method = GET, produces = APPLICATION_JSON_VALUE) diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java index d16b99fa..dd5941cf 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.AnamnesisService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AnamnesisVO; import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; import org.slf4j.Logger; @@ -57,11 +56,11 @@ public class AnamnesisController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAnamnesis", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAnamnesis", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java index fddf5103..6c649de5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java @@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.AnggaranService; import com.jasamedika.medifirst2000.service.DetailAnggaranService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.HeadAnggaranVO; import com.jasamedika.medifirst2000.vo.VerifikasiSpekAnggaranVO; import org.slf4j.Logger; @@ -68,11 +67,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePengajuanUsulanAnggaranBaru", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanUsulanAnggaranBaru", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -95,11 +94,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveVerifikasiSpekAnggaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveVerifikasiSpekAnggaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -114,11 +113,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUnVerifikasiSpekAnggaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUnVerifikasiSpekAnggaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -131,11 +130,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPengendaliByUserLogin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPengendaliByUserLogin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -148,11 +147,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getRuanganByUserLogin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getRuanganByUserLogin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -168,11 +167,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when editPengajuanUsulanAnggaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when editPengajuanUsulanAnggaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } // end add by Arya 2017-01-19 diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java index 63d828f7..3474d56a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ApresiasiAtasLayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ApresiasiAtasLayananVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class ApresiasiAtasLayananController extends LocaleController { - + + private static final Logger LOGGER = getLogger(AsuransiController.class); + @Autowired - private BridgingBpjs bridgingBpjs; - - @Autowired - private PemakaianAsuransiDao pemakaianAsuransiDao; - + private BridgingBpjs bridgingBpjs; + @Autowired private PemakaianAsuransiService pemakaianAsuransiService; - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; - - @Autowired - private RegistrasiPelayananService registrasiPelayananService; - - public AsuransiController() { - } - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); - - @RequestMapping(value = "/save-pemakaian-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pemakaian-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePemakaianAsuransi(@Valid @RequestBody PemakaianAsuransiVO vo, HttpServletRequest request) throws ParseException { try { - Map mapHeaderMessage = new HashMap(); + Map mapHeaderMessage = new HashMap<>(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); Map result = pemakaianAsuransiService.savePemakaianAsuransi(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemakaianAsuransi", 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 savePemakaianAsuransi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/check-kepesertaan/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/check-kepesertaan/{id}", method = GET) public ResponseEntity checkKepesertaaan(@RequestParam(value = "id", required = false) String id) { Object peserta = bridgingBpjs.CekKepesertaan(id); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/detail-sep-peserta/", method = RequestMethod.GET) - public ResponseEntity getDetailSEPPeserta(@RequestParam(value = "noSep", required = true) String noSep) { + + @RequestMapping(value = "/detail-sep-peserta/", method = GET) + public ResponseEntity getDetailSEPPeserta(@RequestParam(value = "noSep") String noSep) { Object peserta = bridgingBpjs.getDetailSEP(noSep); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-kunjungan-peserta/", method = RequestMethod.GET) - public ResponseEntity getDataKunjunganPeserta(@RequestParam(value = "noSep", required = true) String noSep) { + + @RequestMapping(value = "/data-kunjungan-peserta/", method = GET) + public ResponseEntity getDataKunjunganPeserta(@RequestParam(value = "noSep") String noSep) { Object peserta = bridgingBpjs.getDataKunjunganPeserta(noSep); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-riwayat-pelayanan-peserta/", method = RequestMethod.GET) - public ResponseEntity getDataRiwayatPelayananPeserta(@RequestParam(value = "noKartu", required = true) String noKartu) { + + @RequestMapping(value = "/data-riwayat-pelayanan-peserta/", method = GET) + public ResponseEntity getDataRiwayatPelayananPeserta(@RequestParam(value = "noKartu") String noKartu) { Object peserta = bridgingBpjs.getDataRiwayatPelayananPeserta(noKartu); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/check-rujukan/{id}", method = RequestMethod.GET) - public ResponseEntity cekRujukan(@RequestParam(value = "noRujukan", required = false) String noRujukan) { - Object rujukan = bridgingBpjs.CekNoRujukan(noRujukan); - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); - } - - @RequestMapping(value = "/generate-sep", method = RequestMethod.GET) - public ResponseEntity generateSep( - - @RequestParam(value = "noBpjs", required = false) String noBpjs, - @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujuakn, - @RequestParam(value = "tanggalSep", required = false) String tanggalSep, - @RequestParam(value = "noRujukan", required = false) String noRujukan, + @RequestMapping(value = "/generate-sep", method = GET) + public ResponseEntity generateSep(@RequestParam(value = "noBpjs", required = false) String noBpjs, + @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujuakn, + @RequestParam(value = "tanggalSep", required = false) String tanggalSep, + @RequestParam(value = "noRujukan", required = false) String noRujukan, @RequestParam(value = "ppkRujukan", required = false) String ppkRujukan, - @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, - @RequestParam(value = "catatan", required = false) String catatan, - @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, - @RequestParam(value = "poliTujuan", required = false) String poliTujuan, + @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, + @RequestParam(value = "catatan", required = false) String catatan, + @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, + @RequestParam(value = "poliTujuan", required = false) String poliTujuan, @RequestParam(value = "kelasRawat", required = false) String kelasRawat, - @RequestParam(value = "lakaLantas", required = false) String lakaLantas, - @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, + @RequestParam(value = "lakaLantas", required = false) String lakaLantas, + @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, @RequestParam(value = "noCm", required = false) String noCm) { - Object rujukan = bridgingBpjs.GenerateSep(noBpjs, tanggalRujuakn, tanggalSep,noRujukan, ppkRujukan, isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas,lokasiLaka, noCm); - - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); + Object rujukan = bridgingBpjs.GenerateSep(noBpjs, tanggalRujuakn, tanggalSep, noRujukan, ppkRujukan, + isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas, lokasiLaka, noCm); + return getJsonResponse(rujukan, OK); } - + @RequestMapping("/asuransiBPJS") public ModelAndView generateAsuransiBPJS(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noSep", required = true) String noSep) { - - List list = pemakaianAsuransiService.findByNoSep(noSep); + @RequestParam(value = "noSep") String noSep) { + List list = pemakaianAsuransiService.findByNoSep(noSep); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "SURAT ELIGIBILITAS PESERTA"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } - - @RequestMapping(value = "/update-tanggal-pulang-sep", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> generateSep(@Valid @RequestBody Map vo, HttpServletRequest request){ - Map result = bridgingBpjs.UpdateTanggalPulang( - (String)vo.get("noSep"), (String)vo.get("tglPlg"), (String)vo.get("ppkPelayanan")); - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/mapping-sep", method = RequestMethod.GET) - public ResponseEntity mappingSep( - - @RequestParam(value = "noSep", required = false) String noSep, - @RequestParam(value = "noTrans", required = false) String noTrans) { - Object rujukan = bridgingBpjs.mappingTransaksiSep(noSep, noTrans); - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); - } - - @RequestMapping(value = "/update-tglPulang", method = RequestMethod.GET) - public ResponseEntity updateTglPulang( - - @RequestParam(value = "noSep", required = false) String noSep, + @RequestMapping(value = "/update-tglPulang", method = GET) + public ResponseEntity updateTglPulang(@RequestParam(value = "noSep", required = false) String noSep, @RequestParam(value = "tglPulang", required = false) String tglPulang) { Object rujukan = bridgingBpjs.updateTglPulang(noSep, tglPulang); - - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); + return getJsonResponse(rujukan, OK); } - - @RequestMapping(value = "/update-sep", method = RequestMethod.GET) - public ResponseEntity> generateSep( - @RequestParam(value = "noSep", required = false) String noSep, - @RequestParam(value = "noBpjs", required = false) String noBpjs, - @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujukan, - @RequestParam(value = "tanggalSep", required = false) String tanggalSep, - @RequestParam(value = "noRujukan", required = false) String noRujukan, + + @RequestMapping(value = "/update-sep", method = GET) + public ResponseEntity> generateSep( + @RequestParam(value = "noSep", required = false) String noSep, + @RequestParam(value = "noBpjs", required = false) String noBpjs, + @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujukan, + @RequestParam(value = "tanggalSep", required = false) String tanggalSep, + @RequestParam(value = "noRujukan", required = false) String noRujukan, @RequestParam(value = "ppkRujukan", required = false) String ppkRujukan, - @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, - @RequestParam(value = "catatan", required = false) String catatan, - @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, - @RequestParam(value = "poliTujuan", required = false) String poliTujuan, + @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, + @RequestParam(value = "catatan", required = false) String catatan, + @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, + @RequestParam(value = "poliTujuan", required = false) String poliTujuan, @RequestParam(value = "kelasRawat", required = false) String kelasRawat, - @RequestParam(value = "lakaLantas", required = false) String lakaLantas, - @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, + @RequestParam(value = "lakaLantas", required = false) String lakaLantas, + @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, @RequestParam(value = "noCm", required = false) String noCm) { - - Map updateSep = bridgingBpjs.updateSep(noSep, noBpjs, tanggalRujukan, tanggalSep, noRujukan, ppkRujukan, isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas, lokasiLaka, noCm); - return RestUtil.getJsonResponse(updateSep, HttpStatus.OK); + Map updateSep = bridgingBpjs.updateSep(noSep, noBpjs, tanggalRujukan, tanggalSep, noRujukan, + ppkRujukan, isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas, + lokasiLaka, noCm); + return getJsonResponse(updateSep, OK); } - - @RequestMapping(value = "/data-rujukan-rs/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanRS(@RequestParam(value = "noRujukan", required = true) String noRujukan) { + + @RequestMapping(value = "/data-rujukan-rs/", method = GET) + public ResponseEntity getDataRujukanRS(@RequestParam(value = "noRujukan") String noRujukan) { Object peserta = bridgingBpjs.getDataRujukanByNoRujukanRS(noRujukan); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-rujukan-pcare/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanPCare(@RequestParam(value = "noRujukan", required = true) String noRujukan) { - Object peserta = bridgingBpjs.getDataRujukanByNoRujukanPcare(noRujukan); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - - @RequestMapping(value = "/data-rujukan-byNoKartu-rs/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanByNoKartuRS(@RequestParam(value = "noKartu", required = true) String noKartu) { + @RequestMapping(value = "/data-rujukan-byNoKartu-rs/", method = GET) + public ResponseEntity getDataRujukanByNoKartuRS(@RequestParam(value = "noKartu") String noKartu) { Object peserta = bridgingBpjs.getDataRujukanByNoKartuRS(noKartu); + return getJsonResponse(peserta, OK); + } - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + @RequestMapping(value = "/check-kepesertaan-by-nik/", method = GET) + public ResponseEntity> checkKepesertaanByNIK(@RequestParam(value = "nik") String nik) { + Map peserta = bridgingBpjs.checkKepesertaanByNIK(nik); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-rujukan-byNoKartu-pcare/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanByNoKartuPCare(@RequestParam(value = "noKartu", required = true) String noKartu) { - Object peserta = bridgingBpjs.getDataRujukanByKartuPcare(noKartu); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + @RequestMapping(value = "/get-monitor-klaim/", method = GET) + public ResponseEntity> getMonitorKlaim(@RequestParam(value = "tglMasuk") String tglMasuk, + @RequestParam(value = "tglKeluar") String tglKeluar, @RequestParam(value = "kelasRawat") String kelasRawat, + @RequestParam(value = "jnsPelayanan") String jnsPelayanan, @RequestParam(value = "cari") String cari, + @RequestParam(value = "status") String status) { + Map peserta = bridgingBpjs.getMonitoringVerifikasiKlaim(tglMasuk, tglKeluar, kelasRawat, + jnsPelayanan, cari, status); + return getJsonResponse(peserta, OK); } - @RequestMapping(value = "/check-kepesertaan-by-nik/", method = RequestMethod.GET) - public ResponseEntity> checkKepesertaanByNIK(@RequestParam(value = "nik", required = true) String nik) { - Map peserta = bridgingBpjs.checkKepesertaanByNIK(nik); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + @RequestMapping(value = "/delete-sep/", method = GET) + public ResponseEntity> deleteSep(@RequestParam(value = "noSep") String noSep) { + Map dataIntegrasi = bridgingBpjs.deleteSep(noSep); + return getJsonResponse(dataIntegrasi, OK); } - - @RequestMapping(value = "/get-referensi-diagnosa/", method = RequestMethod.GET) - public ResponseEntity> getReferensiDiagnosa(@RequestParam(value = "nama", required = true) String nama) { - Map peserta = bridgingBpjs.getReferensiDiagnosa(nama); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - - @RequestMapping(value = "/get-referensi-faskes/", method = RequestMethod.GET) - public ResponseEntity> getReferensiFaskes(@RequestParam(value = "nama", required = true) String nama, - @RequestParam(value = "start", required = true) Integer start, - @RequestParam(value = "limit", required = true) Integer limit) { - Map peserta = bridgingBpjs.getReferensiFaskes(nama, start, limit); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - @RequestMapping(value = "/get-monitor-klaim/", method = RequestMethod.GET) - public ResponseEntity> getMonitorKlaim(@RequestParam(value = "tglMasuk", required = true) String tglMasuk, - @RequestParam(value = "tglKeluar", required = true) String tglKeluar, - @RequestParam(value = "kelasRawat", required = true) String kelasRawat, - @RequestParam(value = "jnsPelayanan", required = true) String jnsPelayanan, - @RequestParam(value = "cari", required = true) String cari, - @RequestParam(value = "status", required = true) String status) { - Map peserta = bridgingBpjs.getMonitoringVerifikasiKlaim(tglMasuk, tglKeluar, kelasRawat, jnsPelayanan, cari, status); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - @RequestMapping(value = "/get-integrasi-inacbg/", method = RequestMethod.GET) - public ResponseEntity> getIntegrasiSepInacbg(@RequestParam(value = "noSep", required = true) String noSep) { - Map dataIntegrasi = bridgingBpjs.getDataIntegrasiSepInacbg(noSep); - - return RestUtil.getJsonResponse(dataIntegrasi, HttpStatus.OK); - } - - @RequestMapping(value = "/delete-sep/", method = RequestMethod.GET) - public ResponseEntity> deleteSep(@RequestParam(value = "noSep", required = true) String noSep) { - Map dataIntegrasi = bridgingBpjs.deleteSep(noSep); - - return RestUtil.getJsonResponse(dataIntegrasi, HttpStatus.OK); - } - - @RequestMapping(value = "/get-poli", method = RequestMethod.GET) - public ResponseEntity> getPoli() { - Map dataIntegrasi = bridgingBpjs.pencarianDataPoli(); - return RestUtil.getJsonResponse(dataIntegrasi, HttpStatus.OK); - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java index 4c923db5..fc541213 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.B3RuanganInputDataService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.B3RuanganInputDataVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +50,11 @@ public class B3RuanganInputDataController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addBakuMutu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addBakuMutu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +65,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllBakuMutu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllBakuMutu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -83,11 +82,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getBakuMutuParent", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getBakuMutuParent", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -101,11 +100,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getBakuMutuChild", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getBakuMutuChild", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -119,11 +118,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when bakuMutuById", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when bakuMutuById", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java index abcdab4d..e355726e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.BatalRegistrasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.BatalRegistrasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -55,11 +54,11 @@ public class BatalRegistrasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java index b0a7e5da..e0ec8b54 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.BobotIndikator; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.BobotIndikatorService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.BobotIndikatorVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -65,11 +64,11 @@ public class BobotIndikatorController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java index 47262be1..96caae07 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java @@ -2,69 +2,67 @@ package com.jasamedika.medifirst2000.controller; 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.BowidickService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.BowidickVO; 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.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.Collections; 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("/bowidick") -public class BowidickController extends LocaleController { +public class BowidickController extends LocaleController { + @Autowired private BowidickService bowidickService; - - @RequestMapping(value="/save-bowidick", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveBowidick( - @RequestBody BowidickVO dto, + + @RequestMapping(value = "/save-bowidick", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> saveBowidick(@RequestBody BowidickVO vo, HttpServletRequest request) { - Map result = this.bowidickService.saveBowidick(dto); + Map result = this.bowidickService.saveBowidick(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(Collections.singletonList(result), OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-bowidick", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBowidick( - @RequestParam(value="startDate") String startDate, - @RequestParam(value="endDate") String endDate, - HttpServletRequest request) { - Map result = this.bowidickService.getBowidick(startDate, endDate); - - if (!result.isEmpty()) { - 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-bowidick-by-norec", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBowidickByNoRec( - @RequestParam("noRec")String noRec, HttpServletRequest request) { - Map result = this.bowidickService.getBowidickbyNorec(noRec); - - if (!result.isEmpty()) { - 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); } + @RequestMapping(value = "/get-bowidick", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getBowidick(@RequestParam(value = "startDate") String startDate, + @RequestParam(value = "endDate") String endDate, HttpServletRequest request) { + Map result = this.bowidickService.getBowidick(startDate, endDate); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-bowidick-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getBowidickByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + Map result = this.bowidickService.getBowidickbyNorec(noRec); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java index b3eb12e2..150d66c7 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java @@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.service.BundleSetAlatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.BundleSetAlatVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -32,7 +31,7 @@ public class BundleSetAlatController extends LocaleController { @RequestMapping(value = "/get-bundle-set-alat", method = GET, produces = APPLICATION_JSON_VALUE) public Map getBundleSetAlat(HttpServletRequest request) { - return this.bundleSetAlatService.getBundleSetAlat(); + return this.bundleSetAlatService.getBundleSetAlat(); } @RequestMapping(value = "/save-bundle-set-alat", method = POST, produces = APPLICATION_JSON_VALUE) @@ -43,7 +42,7 @@ public class BundleSetAlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java index 9a548d2d..849b037f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CekListGedungBangunanHeaderService; import com.jasamedika.medifirst2000.service.CekListGedungBangunanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CekListGedungBangunanHeaderVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -61,11 +60,11 @@ public class CekListGedungBangunanController extends LocaleController getCekListPemeliharaanGedung(@RequestParam("noRec") String noRec) { - return this.cekListGedungBangunanHeaderService.getCekListPemeliharanGedungByNoRec(noRec); + return this.cekListGedungBangunanHeaderService.getCekListPemeliharanGedungByNoRec(noRec); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java index 357cac4b..baee8f67 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CetakPengantarSuratService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CetakPengantarSuratVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class CetakPengantarSuratController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addCheckIn", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addCheckIn", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -72,11 +71,11 @@ public class CheckInController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findByNoRec", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findByNoRec", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -96,12 +95,12 @@ public class CheckInController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getCheckInByNoRecAntrian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getCheckInByNoRecAntrian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java index 2be3b98a..69fa3438 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CssdBmhpService; import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO; import com.jasamedika.medifirst2000.vo.CssdBmhpVO; import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO; @@ -53,11 +52,11 @@ public class CssdBmhpController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveCssdBmhp", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveCssdBmhp", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -72,11 +71,11 @@ public class CssdBmhpController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when produksiBmhp", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when produksiBmhp", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java index 97b14282..ce259516 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CssdDecontaminasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CssdDecontaminasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class CssdDecontaminasiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDistribusi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDistribusi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java index 06cc33bb..6e47100f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CssdMonitoringEoService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CssdMonitoringEoVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class CssdMonitoringEoController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePengemasan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengemasan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java index 83fe1b60..f5e15fa5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CssdPenyimpananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CssdPenyimpananVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class CssdPenyimpananController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSteril", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSteril", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java index 23f3313a..49550fd9 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.MapPaketToProdukDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CssdSterilisasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CssdSterilisasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class CssdSterilisasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUjiSwap", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUjiSwap", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java index 545aeafc..60bd63d3 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.UnitCost; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.UnitCostService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.UnitCostVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class DaftarKegiatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findDetailCostUnit", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findDetailCostUnit", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -67,11 +66,11 @@ public class DaftarKegiatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListJenisUnitCost", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListJenisUnitCost", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -86,11 +85,11 @@ public class DaftarKegiatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListDetailJenisUnitCost", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListDetailJenisUnitCost", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -106,11 +105,11 @@ public class DaftarKegiatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListUnitCost", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListUnitCost", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java index 2f0f475f..6df10987 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DaftarKendaraanDinasService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.OrderKendaraanDinasVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -79,11 +78,11 @@ public class DaftarKendaraanDinasController extends LocaleController> getDetailPengembalianKendaraanDinasByNoRec( - @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { + @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { Map result = this.daftarKendaraanDinasService.getPengembalianKendaraanDetailByNoRec(noRec); return getJsonResponse(result, OK); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java index 3eb16c69..e5096dfb 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DaftarOrderAmbulanceService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.OrderPelayananVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -74,11 +73,11 @@ public class DaftarOrderAmbulanceController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveStatusSewaAsrama", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveStatusSewaAsrama", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -95,11 +94,11 @@ public class DaftarSewaAsramaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllSewaAsrama", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllSewaAsrama", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java index 0cc5a009..de5e9db1 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DaftarSewaLahanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SewaLahanVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -81,11 +80,11 @@ public class DaftarSewaLahanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveStatusSewaLahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveStatusSewaLahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -99,11 +98,11 @@ public class DaftarSewaLahanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllSewaLahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllSewaLahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java index 458999ad..24bf70aa 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.DampakResiko; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DampakResikoService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DampakResikoVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -64,11 +63,11 @@ public class DampakResikoController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java index 3ea24371..966afc13 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DataPerusahaanYangBekerjaSamaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DataPerusahaanYangBekerjaSamaVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class DataPerusahaanYangBekerjaSamaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -64,11 +63,11 @@ public class DepartemenController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -81,11 +80,11 @@ public class DepartemenController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when delete", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -99,11 +98,11 @@ public class DepartemenController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllDepartemeById5And6", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllDepartemeById5And6", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java index 73a30421..a4cdf562 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DetailRupService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DetailRupCustomVO; import com.jasamedika.medifirst2000.vo.HeadAnggaranVO; import org.slf4j.Logger; @@ -50,11 +49,11 @@ public class DetailRupController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDetailLRup", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDetailLRup", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java index 140f4526..d8557175 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DiagnosaKeperawatanService; import com.jasamedika.medifirst2000.service.DiagnosaKeperawatanTransaksiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DiagnosaKeperawatanTransaksiVO; import com.jasamedika.medifirst2000.vo.DiagnosaKeperawatanVO; import org.slf4j.Logger; @@ -51,11 +50,11 @@ public class DiagnosaKeperawatanTransaksiController extends LocaleController - implements IBaseRestController { - - @Autowired - private DokumenKeluarService dokumenKeluarService; - - private static final Logger LOGGER = LoggerFactory.getLogger(DokumenKeluarController.class); - - @RequestMapping(value = "/save-surat-keluar/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody SuratKeluarVO vo, HttpServletRequest request) { - - try { - Map result = dokumenKeluarService.addSuratKeluar(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 Catatan Perkembangan", 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 Catatan Perkembangan", 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(DokumenKeluarVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(DokumenKeluarVO 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/DraftSuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java index bca57ab9..456d6219 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.DraftSuratRuangan; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DraftSuratService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DraftSuratRuanganVO; import com.jasamedika.medifirst2000.vo.DraftSuratVO; import net.kaczmarzyk.spring.data.jpa.domain.DateBetween; @@ -52,11 +51,11 @@ public class DraftSuratController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addDraftSurat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addDraftSurat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -71,11 +70,11 @@ public class DraftSuratController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getNoSurat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getNoSurat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java index d1e8041b..0779292e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.EdukasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.EdukasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class EdukasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveEdukasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveEdukasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java index a2715fb4..f9bb1c05 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.EkstensionNoTeleponService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.EkstensionNoTeleponVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class EkstensionNoTeleponController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveFasilitas", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveFasilitas", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -72,11 +71,11 @@ public class FasilitasMController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListFasilitasByKelasRuangan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListFasilitasByKelasRuangan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -94,11 +93,11 @@ public class FasilitasMController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListFasilitasByRuangan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListFasilitasByRuangan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -115,11 +114,11 @@ public class FasilitasMController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllDepartemen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllDepartemen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java index 462eece9..726a0079 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dao.custom.PelayananPasienDaoCustom; import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PelayananPasienVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -48,11 +47,11 @@ public class FeeForServiceController extends LocaleController } catch (ServiceVOException se) { LOG.error("ServiceVOException {} when getFeeForService", se.getMessage()); addHeaderMessage(ERROR_MESSAGE, se.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOG.error("JpaSystemException {} when getFeeForService", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java index 79de7a29..23e5b659 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.FisisPemeriksaanDokterService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.FisisPemeriksaanDokterVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -60,11 +59,11 @@ public class FisisPemeriksaanDokterController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findByJenisPeriode", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findByJenisPeriode", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -72,11 +71,11 @@ public class HVAController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveHVA", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveHVA", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -94,11 +93,11 @@ public class HVAController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getSummaryAnalysis", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getSummaryAnalysis", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java index aa812042..bcd41d5c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.HasilPemeriksaanSwaPantauLimbahCairService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.HasilPemeriksaanSwaPantauLimbahCairVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class HasilPemeriksaanSwaPantauLimbahCairController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addHasilPemeriksaanSwaPantauLimbahCair", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addHasilPemeriksaanSwaPantauLimbahCair", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -68,11 +67,11 @@ public class HasilPemeriksaanSwaPantauLimbahCairController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllhasilPemeriksaanSwaPantauLimbahCair", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllhasilPemeriksaanSwaPantauLimbahCair", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -84,11 +83,11 @@ public class HasilPemeriksaanSwaPantauLimbahCairController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteHasilPemeriksaanSwaPantauLimbahCair", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteHasilPemeriksaanSwaPantauLimbahCair", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java index e375da0c..7b30f31b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java @@ -1,18 +1,12 @@ package com.jasamedika.medifirst2000.controller; -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.HistoriPelayananCsService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.HistoriPelayananCsVO; 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.*; @@ -21,176 +15,150 @@ 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("/historiPelayananCs") public class HistoriPelayananCsController extends LocaleController { - private static final Logger LOGGER = LoggerFactory.getLogger(HistoriPelayananCsController.class); + + private static final Logger LOGGER = getLogger(HistoriPelayananCsController.class); @Autowired private HistoriPelayananCsService historiPelayananCsService; - @RequestMapping(value = "/save-histori-pelayanancs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-histori-pelayanancs", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveHistoriPelayananCs(@Valid @RequestBody HistoriPelayananCsVO hpcsvo, HttpServletRequest request) { - try { Map result = this.historiPelayananCsService.saveHistriPelayananCs(hpcsvo); 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 saveHistoriPelayananCs", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when saveHistriPelayananCs", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - - LOGGER.error("Got exception {} when saveHistoriPelayananCs", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveHistriPelayananCs", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-histori-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-histori-pelayanan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListHistoriPelayanan( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { - + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = this.historiPelayananCsService.getListHistoriPelayananCs(ruanganId); - 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 getListHistoriPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getListHistoriPelayananCs", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getListHistoriPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getListHistoriPelayananCs", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-histori-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getLoadData( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { - + @RequestMapping(value = "/get-load-histori-pelayanan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getLoadData(@RequestParam(value = "ruanganId") Integer ruanganId, + HttpServletRequest request) { try { Map result = this.historiPelayananCsService.getLoadData(ruanganId); - 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 getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-pasien-bynocm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataPasienByNoCm( - @RequestParam(value = "noCm", required = true) String noCm, HttpServletRequest request) { - + @RequestMapping(value = "/get-load-pasien-bynocm", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getDataPasienByNoCm(@RequestParam(value = "noCm") String noCm, + HttpServletRequest request) { try { Map result = this.historiPelayananCsService.getListPasienByNoCm(noCm); - 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 getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getListPasienByNoCm", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getListPasienByNoCm", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-produk-informasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-produk-informasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataProdukInformasi(HttpServletRequest request) { - try { Map result = this.historiPelayananCsService.getListProdukInformasi(); - 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 getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getListProdukInformasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getListProdukInformasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-histori-pelayanan-norec/{norec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-histori-pelayanan-norec/{norec}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataHistoriCsByNoRec(@PathVariable(value = "norec") String norec, HttpServletRequest request) { - try { Map result = this.historiPelayananCsService.getListHistoriCsByNorec(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 getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getListHistoriCsByNorec", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getListHistoriCsByNorec", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java index 5bcf947c..9f5ec145 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.IkiDanRemunerasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.IkiDanRemunerasiVO; import com.jasamedika.medifirst2000.vo.SettingPirSdmVO; import com.jasamedika.medifirst2000.vo.StrukHistoriVO; @@ -52,11 +51,11 @@ public class IkiDanRemunerasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveInstruksi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveInstruksi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java index bb6e627c..6491ea05 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.IntraOperasiAnestesiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class IntraOperasiAnestesiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllRegistrasiAset", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllRegistrasiAset", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -70,11 +69,11 @@ public class IpsrsDataAlatController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getOneRegistrasiAset", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getOneRegistrasiAset", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -91,11 +90,11 @@ public class IpsrsDataAlatController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllJenisProdukByIpsrs", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllJenisProdukByIpsrs", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java index fa9394f7..4a0bcc92 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.IpsrsMaintenanceService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.IpsrsPemeliharaanVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class IpsrsMaintenanceController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePermintaanPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePermintaanPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -76,11 +75,11 @@ public class IpsrsPerbaikanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getRuanganPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getRuanganPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -98,11 +97,11 @@ public class IpsrsPerbaikanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAsetPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAsetPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -120,11 +119,11 @@ public class IpsrsPerbaikanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getOnePermintaanPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getOnePermintaanPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -139,11 +138,11 @@ public class IpsrsPerbaikanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePelaksanaanPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePelaksanaanPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -159,11 +158,11 @@ public class IpsrsPerbaikanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updatePermintaanPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updatePermintaanPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java index cb56fda0..d41e60ca 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.IpsrsPreventiveMaintenanceService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.IpsrsPemeliharaanVO; import com.jasamedika.medifirst2000.vo.IpsrsPreventiveMaintenanceVO; import org.slf4j.Logger; @@ -52,11 +51,11 @@ public class IpsrsPreventiveMaintenanceController extends LocaleController { + @Autowired private ItJadwalPerawatanService itJadwalPerawatanService; - - @RequestMapping(value="/save-jadwal", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveJadwalPerawatan( - @RequestBody ItJadwalPerawatanVO dto, HttpServletRequest request) { - Map result = this.itJadwalPerawatanService.saveJadwalPerawatan(dto); + + @RequestMapping(value = "/save-jadwal", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveJadwalPerawatan(@RequestBody ItJadwalPerawatanVO vo, + HttpServletRequest request) { + Map result = this.itJadwalPerawatanService.saveJadwalPerawatan(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-jadwal-perawatan", -// method = RequestMethod.GET, -// produces = MediaType.APPLICATION_JSON_VALUE) -// public Map getJadwalPerawatanIt( -// @RequestParam(value = "startDate") String startDate, -// @RequestParam(value = "endDate") String endDate -// ) { -// Map result = this.itJadwalPerawatanService.getJadwalPerawatanAll(startDate, endDate); -// return result; -// } - - @RequestMapping(value = "/get-jadwal-perawatan-by-norec", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getJadwalPerawatanByNoRec( - @RequestParam(value = "noRec") String noRec) { - Map result = this.itJadwalPerawatanService.getJadwalPerawatanbyNoRec(noRec); - return result; + + @RequestMapping(value = "/get-jadwal-perawatan-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getJadwalPerawatanByNoRec(@RequestParam(value = "noRec") String noRec) { + return this.itJadwalPerawatanService.getJadwalPerawatanbyNoRec(noRec); } - - @RequestMapping(value="/save-realisasi-jadwal", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRealisasiJadwalPerawatan( - @RequestBody ItJadwalPerawatanVO dto, HttpServletRequest request) { - Map result = this.itJadwalPerawatanService.saveRealisasiJadwalPerawatan(dto); + + @RequestMapping(value = "/save-realisasi-jadwal", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRealisasiJadwalPerawatan(@RequestBody ItJadwalPerawatanVO vo, + HttpServletRequest request) { + Map result = this.itJadwalPerawatanService.saveRealisasiJadwalPerawatan(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); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java index f8df1c87..ace4cb2a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ItPerbaikanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ItPelaksanaanPerbaikanVO; import com.jasamedika.medifirst2000.vo.ItPerbaikanVO; import org.slf4j.Logger; @@ -53,11 +52,11 @@ public class ItPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getNoOrderTable", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getNoOrderTable", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -77,11 +76,11 @@ public class ItPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePermintaanPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePermintaanPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -98,11 +97,11 @@ public class ItPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getRuanganPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getRuanganPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -120,11 +119,11 @@ public class ItPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAsetPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAsetPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -139,11 +138,11 @@ public class ItPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePelaksanaanPerbaikanRev1", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePelaksanaanPerbaikanRev1", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -161,11 +160,11 @@ public class ItPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteItPerbaikan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteItPerbaikan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java index b06f870b..93d48fb2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JabatanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JabatanVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class JabatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveJabatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveJabatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -67,11 +66,11 @@ public class JabatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -85,11 +84,11 @@ public class JabatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteJabatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteJabatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -102,11 +101,11 @@ public class JabatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when delete", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java index 96d99b0c..a7cd9752 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java @@ -1,426 +1,182 @@ package com.jasamedika.medifirst2000.controller; -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.JadwalDokterService; -import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JadwalDokterVO; 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.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.Collection; 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_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.DateUtil.toDate; +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("/jadwalDokter") -public class JadwalDokterController extends LocaleController - implements IBaseRestController { +public class JadwalDokterController extends LocaleController { + + private static final Logger LOGGER = getLogger(JadwalDokterController.class); @Autowired private JadwalDokterService jadwalDokterService; - @Autowired - private RuanganService ruanganService; - @Autowired - private PegawaiService pegawaiService; - private static final Logger LOGGER = LoggerFactory.getLogger(JadwalDokterController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(JadwalDokterVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(JadwalDokterVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value = "/save-jadwal-dokter/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jadwal-dokter/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> addVO(@Valid @RequestBody JadwalDokterVO vo, HttpServletRequest request) { - try { Map result = jadwalDokterService.saveJadwalDokter(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 Catatan Perkembangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJadwalDokter", 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 saveJadwalDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/delete-jadwal-dokter/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deleteVO(@Valid @RequestBody JadwalDokterVO vo, - HttpServletRequest request) { - - try { - Map result = jadwalDokterService.deleteJadwalDokter(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 Catatan Perkembangan", 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 Catatan Perkembangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-all-jadwal-dokter/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-all-jadwal-dokter/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> addAllVO(@Valid @RequestBody List vos, HttpServletRequest request) { - try { Map result = jadwalDokterService.saveListJadwalDokter(vos); 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 saveListJadwalDokter", 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 saveListJadwalDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/update-all-jadwal-dokter/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-all-jadwal-dokter/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> updateAllVo(@Valid @RequestBody List vos, HttpServletRequest request) { - try { Map result = jadwalDokterService.updateListJadwalDokter(vos); 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 updateListJadwalDokter", 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 updateListJadwalDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/update-jadwal-dokter/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> editVO(@Valid @RequestBody JadwalDokterVO vo, - HttpServletRequest request) { - - try { - Map result = jadwalDokterService.updateJadwalDokter(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 Catatan Perkembangan", 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 Catatan Perkembangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-list-jadwal-dokter/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addListVO(@Valid @RequestBody List vos, - HttpServletRequest request) { - - try { - Map result = jadwalDokterService.saveListJadwalDokter(vos); - 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 jadwal-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 add jadwal-dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-jadwal-supir/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addJadwalSupirVO(@Valid @RequestBody JadwalDokterVO vo, - HttpServletRequest request) { - - try { - Map result = jadwalDokterService.saveJadwalSupirAmbulance(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 jadwal-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 add jadwal-dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-by-tanggal/{tglJadwal}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByTanggal(@PathVariable("tglJadwal") String tanggalJadwal, - HttpServletRequest request) { - Map result = jadwalDokterService.findByTanggal(DateUtil.toDate(tanggalJadwal)); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/find-by-ruangan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-ruangan/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findByNoCm(@PathVariable("id") Integer id, HttpServletRequest request) { Map result = jadwalDokterService.findByRuangan(id); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-by-ruangan-tanggal/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-ruangan-tanggal/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findByNoCmtglJadwal( @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "tglJadwal", required = false) String tanggalJadwal, HttpServletRequest request) { - - Map result = jadwalDokterService.findJadwalByTanggalRuangan(DateUtil.toDate(tanggalJadwal), id); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + Map result = jadwalDokterService.findJadwalByTanggalRuangan(toDate(tanggalJadwal), 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 RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/find-by-antrian-tanggal/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-antrian-tanggal/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findByNoCmtglJadwal( @RequestParam(value = "noRec", required = false) String noRec, @RequestParam(value = "tglJadwal", required = false) String tanggalJadwal, HttpServletRequest request) { - - Map result = jadwalDokterService.findJadwalByTanggalRuangan(DateUtil.toDate(tanggalJadwal), - noRec); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + Map result = jadwalDokterService.findJadwalByTanggalRuangan(toDate(tanggalJadwal), noRec); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } /* * create by iwan date : 21.04.2017 */ - @RequestMapping(value = "/find-by-periode-ruangan-dokter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-by-periode-ruangan-dokter", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findJadwalDokterByPeriodRuangan( @RequestParam(value = "iddok", required = false) final int iddok, @RequestParam(value = "id", required = false) final int id, @RequestParam(value = "from", required = false) final String from, @RequestParam(value = "to", required = false) final String to, final HttpServletRequest request) { - Map result = this.jadwalDokterService.findJadwalDokterByKisaranTglRuangan(iddok, id, - DateUtil.toDate(from), DateUtil.toDate(to)); - - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - + toDate(from), toDate(to)); + 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_SUCCESS, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - /* - * create by iwan date : 21.04.2017 - */ - @RequestMapping(value = "/find-by-periode-ruangan-all-dokter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findJadwalDokterByPeriodRuangan( - @RequestParam(value = "iddok", required = false) final int iddok, - @RequestParam(value = "from", required = false) final String from, - @RequestParam(value = "to", required = false) final String to, final HttpServletRequest request) { - - Map result = this.jadwalDokterService.findJadwalDokterByKisaranTglRuanganAll(iddok, - DateUtil.toDate(from), DateUtil.toDate(to)); - - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-jadwal-dokter-by-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jadwal-dokter-by-id", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJadwalDokterByIdDokter( @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { Map result = jadwalDokterService.getJadwalDokterByIdDokter(id); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-jadwal-dokter-mingguan-by-id/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getJadwalDokterMingguanByIdDokter( - @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { - Map result = jadwalDokterService.getJadwalDokterMingguanByIdDokter(id); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-jadwal-supir-ambulance/{bulan}/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jadwal-supir-ambulance/{bulan}/{tahun}", method = GET, produces = APPLICATION_JSON_VALUE) public List> getAllInformasi(@PathVariable("bulan") Integer bulan, @PathVariable("tahun") Integer tahun, HttpServletRequest request) { - List> result = null; - result = jadwalDokterService.getJadwalSupirAmbulanceByPeriode(bulan, tahun); - return result; + return jadwalDokterService.getJadwalSupirAmbulanceByPeriode(bulan, tahun); } - @RequestMapping(value = "/get-jadwal-supir-ambulance/{id}/{bulan}/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jadwal-supir-ambulance/{id}/{bulan}/{tahun}", method = GET, produces = APPLICATION_JSON_VALUE) public List> getJadwalByIdAndPeriode(@PathVariable("id") Integer id, @PathVariable("bulan") Integer bulan, @PathVariable("tahun") Integer tahun, HttpServletRequest request) { - List> result = null; - result = jadwalDokterService.getJadwalSupirAmbulanByIdAndPeriode(id, bulan, tahun); - return result; + return jadwalDokterService.getJadwalSupirAmbulanByIdAndPeriode(id, bulan, tahun); } - @RequestMapping(value = "/get-jadwal-by-date/{tanggal}/{bulan}/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getJadwalByDate(@PathVariable("tanggal") Integer tanggal, - @PathVariable("bulan") Integer bulan, @PathVariable("tahun") Integer tahun, HttpServletRequest request) { - Map result = null; - try { - result = jadwalDokterService.getJadwalSupirByDate(tanggal, bulan, tahun); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - /* - * Author : Lukman Hakim - */ - @RequestMapping(value = "/get-pegawai-by-ruangan/{ruangan}/{tahun}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPegawaiByRuangan(@PathVariable("ruangan") Integer ruangan, - @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { - Map result = null; - try { - result = pegawaiService.findPegawaiByRuanganRev(ruangan, tahun, bulan); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java index 94f30849..724a31db 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JadwalDpjpRawatInapService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JadwalDpjpRawatInapVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -46,11 +45,11 @@ public class JadwalDpjpRawatInapController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveJenisBahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveJenisBahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @RequestMapping(value = "/get-jenis-bahan/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getAll(HttpServletRequest request) { - return this.jenisBahanService.getJenisBahan(); + return this.jenisBahanService.getJenisBahan(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java index f12e8cd1..8b05c107 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.JenisDiet; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JenisDietService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JenisDietVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -52,11 +51,11 @@ public class JenisDietController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when generate", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when generate", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -81,11 +80,11 @@ public class JenisDietController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java index cdc5e56d..860b9d82 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JenisLimbahB3MasukService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JenisLimbahB3MasukVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class JenisLimbahB3MasukController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveJenisLinen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveJenisLinen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -67,11 +66,11 @@ public class JenisLinenController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllJenisLinen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllJenisLinen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -83,11 +82,11 @@ public class JenisLinenController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteJenisLinen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteJenisLinen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java index afc8dc4f..a6013e32 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JenisResponService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JenisResponVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class JenisResponController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveJenisRespon", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveJenisRespon", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java index 590b57a6..646ab752 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.JenisWaktu; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JenisWaktuService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.JenisWaktuVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -64,17 +63,17 @@ public class JenisWaktuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @RequestMapping(value = "/get-jenis-waktu/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getJenisWaktu(HttpServletRequest request) { - return this.jenisWaktuService.getJenisWaktu(); + return this.jenisWaktuService.getJenisWaktu(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java index 7c6ea496..c9f3d94c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.K3CheckListFacillitySefetyService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.K3CheckListFacillitySefetyVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +50,11 @@ public class K3CheckListFacillitySefetyController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveKajian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveKajian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -112,11 +111,11 @@ public class KajianEvaluasiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateKajian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateKajian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -131,11 +130,11 @@ public class KajianEvaluasiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteKajian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteKajian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java index affca197..274bd29a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java @@ -1,127 +1,89 @@ package com.jasamedika.medifirst2000.controller; -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.KamusIndikator; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KamusIndikatorService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KamusIndikatorVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; 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.data.jpa.domain.Specifications; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import 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 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("/kamus-indikator") -public class KamusIndikatorController extends LocaleController -implements IBaseRestController{ +public class KamusIndikatorController extends LocaleController { + + private static final Logger LOGGER = getLogger(KamusIndikatorController.class); @Autowired private KamusIndikatorService kamusIndikatorService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PegawaiController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(KamusIndikatorVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(KamusIndikatorVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value="/find-all/", method= RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findAll( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "100") Integer take, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, @Spec(path = "id", params = "id", spec = Equal.class) Specification id, - @Spec(path = "indikator.sasaranStrategis.id", params = "sasaranStrategisId", spec = Equal.class) Specification sasaran) - { - Specification spec = Specifications.where(id).and(sasaran); - Map result = new HashMap(); - result = kamusIndikatorService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "indikator.sasaranStrategis.id", params = "sasaranStrategisId", spec = Equal.class) Specification sasaran) { + Specification spec = Specifications.where(id).and(sasaran); + Map result = kamusIndikatorService.findAll(page, take, sort, dir, spec); + return constructListPageResult(result); } - - @RequestMapping(value="/detail-indikator/", method= RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/detail-indikator/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findAll( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "100") Integer take, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) - { - Map result = new HashMap(); - result = kamusIndikatorService.findDetail(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) { + Map result = kamusIndikatorService.findDetail(page, take, sort, dir, spec); + return constructListPageResult(result); } - @RequestMapping(value="/save/", method= RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody KamusIndikatorVO vo,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody KamusIndikatorVO vo, + HttpServletRequest request) { + try { Map result = kamusIndikatorService.save(vo); - if(null!= result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 add/update kamus IKU", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add/update kamus IKU", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java index c2715476..b69e70db 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DetailAnggaranService; import com.jasamedika.medifirst2000.service.KartuPengendaliService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -58,11 +57,11 @@ public class KartuPengendaliController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getKategoryProdukGizi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getKategoryProdukGizi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java index 3b255a20..3b43ffe3 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KebutuhanDasarService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KebutuhanDasarVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -62,11 +61,11 @@ public class KebutuhanDasarController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addKebutuhanDasar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addKebutuhanDasar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java index df64378e..ef362fbe 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KelasService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KelasVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class KelasController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +65,11 @@ public class KelasController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -83,11 +82,11 @@ public class KelasController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when delete", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } catch (DataIntegrityViolationException ex) { LOGGER.error("Got DataIntegrityViolationException {} when delete", ex.getMessage()); addHeaderMessage(ERROR_MESSAGE, ex.getMessage()); @@ -107,11 +106,11 @@ public class KelasController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findKelasByRuangan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findKelasByRuangan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java index ff75a257..7a1a97cd 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java @@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KeluargaPegawaiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KeluargaPegawaiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -56,11 +55,11 @@ public class KeluargaPegawaiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveKomunikasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveKomunikasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java index 4f914532..b9ccee40 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KonsepDiriService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KonsepDiriVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -58,11 +57,11 @@ public class KonsepDiriController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addKonsepDiri", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addKonsepDiri", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java index 46f4f9dd..9eef8ea2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KonsultasiService; import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; import com.jasamedika.medifirst2000.vo.KonsultasiVO; import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; @@ -66,11 +65,11 @@ public class KonsultasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveKontrak", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveKontrak", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -68,11 +67,11 @@ public class KontrakController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveKontrakDetail", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveKontrakDetail", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -86,13 +85,12 @@ public class KontrakController extends LocaleController { @RequestParam(value = "noKontrak", required = false) String noKontrak, @RequestParam(value = "rekananId", required = false) Integer rekananId, @RequestParam(value = "namaKontrak", required = false) String namaKontrak) { - return kontrakService.listKontrak(page, limit, sort, dir, noKontrak, rekananId, - namaKontrak); + return kontrakService.listKontrak(page, limit, sort, dir, noKontrak, rekananId, namaKontrak); } @RequestMapping(value = "/detail-kontrak", method = GET, produces = APPLICATION_JSON_VALUE) public Map detilKontrak(@RequestParam(value = "noRec") String noRec) { - return kontrakService.detilKontrak(noRec); + return kontrakService.detilKontrak(noRec); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java index 76db1a5e..500fe01c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.KontrakKinerja; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KontrakKinerjaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -70,11 +69,11 @@ public class KontrakKinerjaController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java index 9023dc30..f879407a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.KopingService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.KopingVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -59,11 +58,11 @@ public class KopingController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addKoping", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addKoping", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java index bd677cee..cf6d61ca 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.LapPembedahanDanInstruksiPascaBedahService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO; import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperatifVO; import org.slf4j.Logger; @@ -51,11 +50,11 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveLapInstruksiPascaBedahHeader", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveLapInstruksiPascaBedahHeader", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -74,12 +73,12 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListAsuhanByNoTrans", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListAsuhanByNoTrans", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -97,11 +96,11 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPasienDaftarOperasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPasienDaftarOperasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -118,11 +117,11 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getMacamInfus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getMacamInfus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java index f78f50c7..39186670 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.LaporanUjiHasilService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.LaporanUjiHasilVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class LaporanUjiHasilController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-penerimaan-linen", method = POST, produces = APPLICATION_JSON_VALUE) @@ -58,7 +57,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/generate-no-struk", method = GET, produces = APPLICATION_JSON_VALUE) @@ -68,7 +67,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-satuan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -78,7 +77,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-penerimaan-linen-filter", method = GET, produces = APPLICATION_JSON_VALUE) @@ -92,7 +91,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } private String changeTimeEndPeriode(String endPeriode) { @@ -119,7 +118,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-bahan-from-mesin-proses", method = GET, produces = APPLICATION_JSON_VALUE) @@ -131,7 +130,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-proses-cuci", method = POST, produces = APPLICATION_JSON_VALUE) @@ -142,7 +141,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-pencucian", method = GET, produces = APPLICATION_JSON_VALUE) @@ -156,7 +155,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-proses-bilas", method = GET, produces = APPLICATION_JSON_VALUE) @@ -167,7 +166,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pembilasan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -178,7 +177,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-pembilasan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -191,7 +190,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pengeringan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -202,7 +201,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-produk-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -212,7 +211,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pelipatan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -223,7 +222,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -236,7 +235,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/cek-stok-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -247,7 +246,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/cek-produk-pelipatan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -258,7 +257,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-produk-penerimaan-linen-external", method = GET, produces = APPLICATION_JSON_VALUE) @@ -268,7 +267,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-penerimaan-linen-external", method = POST, produces = APPLICATION_JSON_VALUE) @@ -279,7 +278,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-satuan-potong", method = GET, produces = APPLICATION_JSON_VALUE) @@ -289,7 +288,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pembilasan-to-pengeringan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -302,7 +301,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pengeringan-to-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -315,7 +314,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-pengambilan-eksternal", method = GET, produces = APPLICATION_JSON_VALUE) @@ -330,7 +329,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pengambilan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -341,7 +340,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/retur-laundry", method = POST, produces = APPLICATION_JSON_VALUE) @@ -352,7 +351,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-retur-linen", method = GET, produces = APPLICATION_JSON_VALUE) @@ -365,7 +364,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-retur-linen", method = GET, produces = APPLICATION_JSON_VALUE) @@ -378,7 +377,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pengambilan-linen-internal", method = POST, produces = APPLICATION_JSON_VALUE) @@ -389,7 +388,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-penerimaan-linen-internal", method = POST, produces = APPLICATION_JSON_VALUE) @@ -400,7 +399,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-permintaan-linen-bersih-dari-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -431,7 +430,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-proses-cuci-external", method = POST, produces = APPLICATION_JSON_VALUE) @@ -442,7 +441,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-proses-cuci", method = GET, produces = APPLICATION_JSON_VALUE) @@ -476,7 +475,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-proses-pengeringan-external", method = POST, produces = APPLICATION_JSON_VALUE) @@ -487,7 +486,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-proses-pengeringan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -522,7 +521,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-proses-pelipatan-external", method = POST, produces = APPLICATION_JSON_VALUE) @@ -533,7 +532,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-proses-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -568,7 +567,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-proses-rollpress-external", method = POST, produces = APPLICATION_JSON_VALUE) @@ -579,7 +578,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-proses-rollpress", method = GET, produces = APPLICATION_JSON_VALUE) @@ -624,7 +623,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-distribusi-linen-bersih", method = GET, produces = APPLICATION_JSON_VALUE) @@ -647,7 +646,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-distribusi-linen-bersih-detail", method = GET, produces = APPLICATION_JSON_VALUE) @@ -688,7 +687,7 @@ public class LaundryController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-jenis-linen", method = GET, produces = APPLICATION_JSON_VALUE) diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java index 2ea33ad0..60078534 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.LevelTingkatDto; import com.jasamedika.medifirst2000.service.LevelTingkatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.LevelTingkatVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -39,7 +38,7 @@ public class LevelTingkatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-level-tingkat", method = GET, produces = APPLICATION_JSON_VALUE) @@ -49,7 +48,7 @@ public class LevelTingkatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java index 44d48e46..d4e9f7a2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.LimbahB3KeluarService; import com.jasamedika.medifirst2000.service.LimbahB3MasukService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.LimbahB3KeluarVO; import com.jasamedika.medifirst2000.vo.LimbahB3MasukVO; import org.slf4j.Logger; @@ -54,11 +53,11 @@ public class LimbahB3KeluarController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addLimbahB3Keluar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addLimbahB3Keluar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -76,11 +75,11 @@ public class LimbahB3KeluarController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteLimbahB3Keluar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteLimbahB3Keluar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } @@ -110,11 +109,11 @@ public class LimbahB3KeluarController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getTotalBeratLimbah", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getTotalBeratLimbah", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -130,11 +129,11 @@ public class LimbahB3KeluarController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getTotalBeratLimbahList", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getTotalBeratLimbahList", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java index 0cfbbb09..2c10fee0 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java @@ -1,9 +1,7 @@ package com.jasamedika.medifirst2000.controller; -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.GantiPasswordDto; import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.exception.ServiceVOException; @@ -12,17 +10,17 @@ import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.PasswordUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.LoginUserVO; 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.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -31,106 +29,78 @@ import java.util.HashMap; 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.*; +import static com.jasamedika.medifirst2000.core.web.WebConstants.PageParameter.*; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; + @RestController @RequestMapping("/user") public class LoginUserController extends LocaleController { - //Alter by Syamsu - @Autowired private TokenAuthenticationService tokenAuthenticationService; - //Alter by Syamsu - @Autowired private LoginUserService loginUserService; private static final Logger LOGGER = LoggerFactory.getLogger(LoginUserController.class); - - /// Alter by Syamsu untuk edit data password user - // nanti tambahkan AppPermission, sehingga minta supervisi user name dan password otomatis untuk dirinya sendiri - @RequestMapping(value = "/update-password-user/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/update-password-user/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) @AppPermission(AppPermission.SPECIALS) - public ResponseEntity updatePassword(@Valid @RequestBody GantiPasswordDto ubah, HttpServletRequest request){ - + public ResponseEntity updatePassword(@Valid @RequestBody GantiPasswordDto ubah, + 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(ubah.getPassword(), user.getKataSandi()); - + boolean isValidPassword = passwordUtil.isPasswordEqual(ubah.getPassword(), user.getKataSandi()); if (isValidPassword) { - LoginUserVO vo = loginUserService.findById(ubah.getId()); vo.setId(ubah.getId()); vo.setKataSandi(ubah.getKataSandi()); LoginUserVO result = loginUserService.update(vo); - - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS)); - return RestUtil.getJsonResponse(String.valueOf(vo.getId()), HttpStatus.OK, mapHeaderMessage); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS)); + return getJsonResponse(String.valueOf(vo.getId()), OK, mapHeaderMessage); } else { - LOGGER.error("Got exception {} when update password User failed"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "update password User failed"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got exception when update password User failed"); + addHeaderMessage(ERROR_MESSAGE, "update password User failed"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - }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); + } else { + LOGGER.error("Got exception when update Pegawai, password invalid"); + 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 update Pegawai"); + addHeaderMessage(ERROR_MESSAGE, "User is unauthorized"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update password User", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update password User", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } catch (Exception ex) { - LOGGER.error("Got exception {} when update password User", ex.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ex.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got Exception {} when update", ex.getMessage()); + addHeaderMessage(ERROR_MESSAGE, ex.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - -// return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); } - - - @RequestMapping(value = "/edit-user/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity editVO(@Valid @RequestBody LoginUserVO vo, HttpServletRequest request) { - try { - LoginUserVO result = loginUserService.update(vo); - if (null != result) - return RestUtil.getJsonResponse(String.valueOf(vo.getId()), HttpStatus.OK); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update User", 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 User", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); - } - - @SuppressWarnings("unchecked") public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "limit", required = false) Integer limit, @@ -138,123 +108,92 @@ public class LoginUserController extends LocaleController { @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { Map resultPageMap = loginUserService.findAllWithPageAndLimitAndSortByAndDirectionParameter(page, limit, sort, dir); - return constructListPageResult(resultPageMap, request); } - @SuppressWarnings("rawtypes") - private ResponseEntity constructListPageResult(Map map, HttpServletRequest request) { - + private ResponseEntity> constructListPageResult(Map map, + HttpServletRequest request) { if (map == null) { - Map mapHeaderMessage = new HashMap(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, "0"); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, "0"); - mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Data not found."); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, mapHeaderMessage); + Map mapHeaderMessage = new HashMap<>(); + mapHeaderMessage.put(TOTAL_PAGE_HEADER, "0"); + mapHeaderMessage.put(TOTAL_COUNT_HEADER, "0"); + mapHeaderMessage.put(ERROR_MESSAGE, "Data not found."); + return getJsonResponse(null, BAD_REQUEST, mapHeaderMessage); } else { - @SuppressWarnings("unchecked") - Collection vos = (Collection) map.get(WebConstants.PageParameter.LIST_DATA); - - Map mapHeaderMessage = new HashMap(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, - String.valueOf(map.get(WebConstants.PageParameter.TOTAL_PAGES))); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, - String.valueOf(map.get(WebConstants.PageParameter.TOTAL_ELEMENTS))); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - - return RestUtil.getJsonResponse(vos, HttpStatus.OK, mapHeaderMessage); + Collection vos = (Collection) map.get(LIST_DATA); + Map mapHeaderMessage = new HashMap<>(); + mapHeaderMessage.put(TOTAL_PAGE_HEADER, String.valueOf(map.get(TOTAL_PAGES))); + mapHeaderMessage.put(TOTAL_COUNT_HEADER, String.valueOf(map.get(TOTAL_ELEMENTS))); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(vos, OK, mapHeaderMessage); } } - - - @RequestMapping(value = "/list-user", method = RequestMethod.GET) - public ResponseEntity> listUser() { - List loginUserVOs = loginUserService.findAll(); - return RestUtil.getJsonResponse(loginUserVOs, HttpStatus.OK, mapHeaderMessage); - } - - @RequestMapping(value = "/get-user", method = RequestMethod.GET) + @RequestMapping(value = "/get-user", method = GET) public ResponseEntity getUser() { LoginUser loginUser = loginUserService.getLoginUser(); - return RestUtil.getJsonResponse(loginUser, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(loginUser, OK, mapHeaderMessage); } - - @RequestMapping(value = "/get-all-user/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-user/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllUser(HttpServletRequest request) { - Map result = null; - try{ - result = loginUserService.getAllUser(); - Boolean dataFound=new Boolean((boolean) result.get("dataFound")); - - if(dataFound){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); + try { + Map result = loginUserService.getAllUser(); + boolean dataFound = (boolean) result.get("dataFound"); + if (dataFound) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - }catch (Exception e){ - e.printStackTrace(); + return getJsonResponse(result, OK); + } catch (Exception e) { + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - - //----------------------------------------------------------------------------------------------------------------------------- - - @RequestMapping(value = "/get-load-data", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-load-data", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData(HttpServletRequest request) { try { - Map result = loginUserService.getLoadData(); - 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 = loginUserService.getLoadData(); + 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 getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-login-user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveLoginUser(@Valid @RequestBody LoginUserVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-login-user", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveLoginUser(@Valid @RequestBody LoginUserVO vo, + HttpServletRequest request) { try { - Map result = loginUserService.saveUpdateLoginUser(vo); + Map result = loginUserService.saveUpdateLoginUser(vo); if (CommonUtil.isNullOrEmpty(result.get("statusError"))) { - 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); } else { Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusError")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + headerMessageCustom.put("label-success", result.get("statusError").toString()); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveLoginUser", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUpdateLoginUser", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveLoginUser", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUpdateLoginUser", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/check-nama-user", method = RequestMethod.GET) - public boolean namaUserExists(@RequestParam(value = "nama-user", required = true) String namaUser) { - List users = loginUserService.findByNamaUser(namaUser); - if (!users.isEmpty()) { - return true; - } - return false; - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java index 1bb8d081..71a33b20 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ManagementDashboardService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ManagementDashboardVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +50,11 @@ public class ManagementController extends LocaleController result = manajemenPromosiService.addManajemenPromosi(vo); if (null != result) - mapHeaderMessage.put(LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addManajemenPromosi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addManajemenPromosi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java index fd811898..c7b51e3d 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java @@ -2,56 +2,53 @@ package com.jasamedika.medifirst2000.controller; 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.MapJenisDietToProdukService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MapJenisDietToProdukVO; 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 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("/map-jenis-diet-to-produk") -public class MapJenisDietToProdukController extends LocaleController{ +public class MapJenisDietToProdukController extends LocaleController { + @Autowired private MapJenisDietToProdukService mapJenisDietToProdukService; - - @RequestMapping(value="/get/", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get/", method = GET, produces = APPLICATION_JSON_VALUE) public Map get(HttpServletRequest request) { - Map result = this.mapJenisDietToProdukService.getMapJenisDietToProduk(); - return result; + return this.mapJenisDietToProdukService.getMapJenisDietToProduk(); } - - @RequestMapping(value="/save/", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> save( - @RequestBody List dtos, HttpServletRequest request){ + + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> save(@RequestBody List dtos, + HttpServletRequest request) { List> result = this.mapJenisDietToProdukService.saveMapJenisDietToProduk(dtos); 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-produk-gizi/", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-produk-gizi/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getProdukGizi(HttpServletRequest request) { - Map result = this.mapJenisDietToProdukService.getProdukGizi(); - return result; + return this.mapJenisDietToProdukService.getProdukGizi(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java index 9a28c56b..575cdcc2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java @@ -1,71 +1,66 @@ package com.jasamedika.medifirst2000.controller; import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -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.MapKebutuhanSaranaToKamarService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MapKebutuhanSaranaToKamarVO; 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.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import 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("/map-kebutuhan-sarana-to-kamar") -public class MapKebutuhanSaranaToKamarController extends LocaleController{ - private static final Logger LOGGER = LoggerFactory.getLogger(MapKebutuhanSaranaToKamarController.class); - - @Autowired +public class MapKebutuhanSaranaToKamarController extends LocaleController { + + private static final Logger LOGGER = getLogger(MapKebutuhanSaranaToKamarController.class); + + @Autowired private MapKebutuhanSaranaToKamarService mapKebutuhanSaranaToKamarService; - - @RequestMapping(value = "/save/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody MapKebutuhanSaranaToKamarVO dto, + + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody MapKebutuhanSaranaToKamarVO vo, HttpServletRequest request) { try { - Map result = this.mapKebutuhanSaranaToKamarService.save(dto); + Map result = this.mapKebutuhanSaranaToKamarService.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 save", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } + } - } - - @RequestMapping(value="/get-all-data", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getAllData(@RequestParam("idKamar")Integer idKamar, HttpServletRequest request) { - Map result = this.mapKebutuhanSaranaToKamarService.getDataAll(idKamar); - return result; - } - - @RequestMapping(value="/get-data-by-id", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getDataById(@RequestParam("id")Integer id, HttpServletRequest request) { - Map result = this.mapKebutuhanSaranaToKamarService.getDataById(id); - return result; + @RequestMapping(value = "/get-all-data", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getAllData(@RequestParam("idKamar") Integer idKamar, HttpServletRequest request) { + return this.mapKebutuhanSaranaToKamarService.getDataAll(idKamar); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java index 99423d16..fd641f6b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MapPegawaiIpsrsService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MapPegawaiIpsrsVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class MapPegawaiIpsrsController extends LocaleController implements -IBaseRestController { - +public class MapRuanganToKelasController extends LocaleController { + + private static final Logger LOGGER = getLogger(MapRuanganToKelasController.class); + @Autowired - private MapRuanganToKelasService mapRuanganToKelasService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(MapRuanganToKelasController.class); + private MapRuanganToKelasService mapRuanganToKelasService; - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @RequestMapping(value = "/save-map-ruangan-to-kelas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-map-ruangan-to-kelas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody MapRuanganToKelasBulkVO vo, HttpServletRequest request) { - try { - List result = mapRuanganToKelasService.addVo(vo); - + List result = mapRuanganToKelasService.addVo(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse("", HttpStatus.CREATED,mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Map Ruangan to Kelas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addVo", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Map Ruangan to Kelas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addVo", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/update-map-ruangan-to-kelas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-map-ruangan-to-kelas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity editVO(@Valid @RequestBody MapRuanganToKelasBulkVO vo) { try { - List result = mapRuanganToKelasService.updateVo(vo); - + List result = mapRuanganToKelasService.updateVo(vo); if (null != result) - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ""); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("", HttpStatus.CREATED); - + addHeaderMessage(ERROR_MESSAGE, ""); + getJsonHttpStatus(CREATED); + return getJsonResponse("", CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Map Ruangan to Kelas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateVo", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Map Ruangan to Kelas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updateVo", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/search-map-ruangan-to-kelas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryString( - @RequestParam(value = "page", required = false ,defaultValue = "1") Integer page, - @RequestParam(value = "limit", required = false ,defaultValue = "10") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir){ - Map resultPageMap = mapRuanganToKelasService.findAllWithPageAndLimitAndSortByAndDirectionParameter(page, - limit, sort, dir); - return constructListPageResult(resultPageMap); - } - - - @RequestMapping(value = "/delete-mapRuanganToKelas/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteVO(Integer id) { - try { - if (mapRuanganToKelasService.delete(id) == true) - return RestUtil.getJsonResponse("", HttpStatus.CREATED); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete MapRuanganToKelas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete MapRuanganToKelas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - @Override - public ResponseEntity addVO(MapRuanganToKelasBulkVO vo) { - return null; - } - - @RequestMapping(value = "/get-ruangan-by-kelas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-ruangan-by-kelas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRuanganByRuangan( - @RequestParam(value="kelasId",required = false) Integer kelasId, HttpServletRequest request) { + @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) { try { - Map result = mapRuanganToKelasService.getRuanganByKelas(kelasId); - 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 = mapRuanganToKelasService.getRuanganByKelas(kelasId); + 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 getRuanganByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getRuanganByKelas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getRuanganByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getRuanganByKelas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-kelas-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-kelas-by-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKelasByRuangan( - @RequestParam(value="ruanganId",required = false) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) { try { - Map result = mapRuanganToKelasService.getKelasByRuangan(ruanganId); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = mapRuanganToKelasService.getKelasByRuangan(ruanganId); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getKelasByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getKelasByRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getKelasByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getKelasByRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-kamar-by-kelas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-kamar-by-kelas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKamarByKelas( - @RequestParam(value="kelasId",required = false) Integer kelasId, - @RequestParam(value="ruanganId",required = false) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "kelasId", required = false) Integer kelasId, + @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) { try { - Map result = mapRuanganToKelasService.getKamarByKelas(kelasId, ruanganId); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = mapRuanganToKelasService.getKamarByKelas(kelasId, ruanganId); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getKamarByKelas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getKamarByKelas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getKamarByKelas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getKamarByKelas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java index 76dcb8e7..01deb367 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MappingAlatToBundleService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MappingAlatToBundleVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class MappingAlatToBundleController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMappingCycle", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMappingCycle", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -69,11 +68,11 @@ public class MappingCycleController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findNamaBahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findNamaBahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -86,11 +85,11 @@ public class MappingCycleController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findMesinDenganKapasitas", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findMesinDenganKapasitas", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -103,11 +102,11 @@ public class MappingCycleController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getMappingCycle", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getMappingCycle", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -121,11 +120,11 @@ public class MappingCycleController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getMappingCycleByNoRec", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getMappingCycleByNoRec", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java index c94d6e59..ff180922 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.MappingJenisLinenToProdukDto; import com.jasamedika.medifirst2000.service.MappingJenisLinenToProdukService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -40,7 +39,7 @@ public class MappingJenisLinenToProdukController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMasalahKeperawatanService", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMasalahKeperawatanService", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java index e4d22c2f..ce081e39 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.MasterProgramKerjaStrategis; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MasterProgramKerjaStrategisService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MasterProgramKerjaStrategisVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -65,11 +64,11 @@ public class MasterProgramKerjaStrategisController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMasukKamar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMasukKamar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java index b8683809..c9f78951 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MenuService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ProdukVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -56,11 +55,11 @@ public class MenuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMenu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMenu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java index 788f97f9..f513d5d4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java @@ -1,36 +1,37 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.dao.LoginUserDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.logging.hibernate.async.LoggingSystemAsynchronous; -import com.jasamedika.medifirst2000.service.*; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.service.LoginUserService; +import com.jasamedika.medifirst2000.service.MapLoginUserToRuanganService; +import com.jasamedika.medifirst2000.service.ModulAplikasiService; +import com.jasamedika.medifirst2000.service.ObjekModulAplikasiService; import com.jasamedika.medifirst2000.vo.MapLoginUserToRuanganVO; -import com.jasamedika.medifirst2000.vo.MapPegawaiToModulAplikasiVO; import com.jasamedika.medifirst2000.vo.ModulAplikasiVO; import com.jasamedika.medifirst2000.vo.ObjekModulAplikasiVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import java.util.Collection; import java.util.List; import java.util.Map; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.util.CommonUtil.isNotNullOrEmpty; +import static com.jasamedika.medifirst2000.util.CommonUtil.isNullOrEmpty; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.defaultJsonResponse; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.UNAUTHORIZED; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; + /** * Controller class for menu modul * @@ -38,11 +39,10 @@ import java.util.Map; */ @RestController -@RequestMapping({ "/test-tanpa-auth/modul-aplikasi", "/modul-aplikasi" }) -public class MenuDinamicController extends LocaleController - implements IBaseRestController { +@RequestMapping("/modul-aplikasi") +public class MenuDinamicController extends LocaleController { - private static final Logger LOGGER = LoggerFactory.getLogger(MenuDinamicController.class); + private static final Logger LOGGER = getLogger(MenuDinamicController.class); @Autowired ModulAplikasiService modulAplikasiService; @@ -56,156 +56,77 @@ public class MenuDinamicController extends LocaleController @Autowired LoggingSystemAsynchronous loggingSystemAsynchronous; - @Autowired - MapPegawaiToModulAplikasiService mapPegawaiToModulAplikasiService; - @Autowired LoginUserService loginUserService; - @Autowired - PegawaiService pegawaiService; - - @Autowired - private LoginUserDao loginUserDao; - - @Autowired - RuanganDao ruanganDao; - - @RequestMapping(value = "/keluar-ruangan/{modulaplikasiId:[0-9]+}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/keluar-ruangan/{modulaplikasiId:[0-9]+}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity keluarRuangan(@PathVariable("modulaplikasiId") int modulaplikasiId, HttpServletRequest request) { try { LoginUser loginUser = loginUserService.getLoginUser(); Integer idPegawai = 0; - if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { + if (isNotNullOrEmpty(loginUser.getPegawai())) idPegawai = loginUser.getPegawai().getId(); - } loggingSystemAsynchronous.saveSignInLog(modulaplikasiId, 0, loginUser.getNamaUser(), idPegawai); Pegawai pegawai = loginUser.getPegawai(); - return RestUtil.defaultJsonResponse(pegawai); + return defaultJsonResponse(pegawai); } catch (Exception e) { - LOGGER.info("Got exception {} in get objek modul aplikasi", e); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Gagal pilih ruangan."); - return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage); + LOGGER.info("Got exception {} in getLoginUser(keluarRuangan)", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, "Gagal pilih ruangan."); + return getJsonHttpStatus(UNAUTHORIZED, mapHeaderMessage); } } - @RequestMapping(value = "/pilih-ruangan/{modulaplikasiId:[0-9]+}/{ruanganId:[0-9]+}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/pilih-ruangan/{modulaplikasiId:[0-9]+}/{ruanganId:[0-9]+}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity pilihRuangan(@PathVariable("modulaplikasiId") int modulaplikasiId, @PathVariable("ruanganId") int ruanganId, HttpServletRequest request) { try { LoginUser loginUser = loginUserService.getLoginUser(); Integer idPegawai = 0; - if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { + if (isNotNullOrEmpty(loginUser.getPegawai())) idPegawai = loginUser.getPegawai().getId(); - } - Pegawai pegawai = loginUser.getPegawai(); // loginUserService.updateRuanganPegawaiPerLoginPerpindahRuangan(ruanganId); + Pegawai pegawai = loginUser.getPegawai(); loggingSystemAsynchronous.saveSignInLog(modulaplikasiId, ruanganId, loginUser.getNamaUser(), idPegawai); - return RestUtil.defaultJsonResponse(pegawai); + return defaultJsonResponse(pegawai); } catch (Exception e) { - LOGGER.info("Got exception {} in get objek modul aplikasi", e); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Gagal pilih ruangan."); - return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage); + LOGGER.info("Got exception {} in getLoginUser(pilihRuangan)", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, "Gagal pilih ruangan."); + return getJsonHttpStatus(UNAUTHORIZED, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-sub-system", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-sub-system", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllSubSystem() { - return RestUtil.defaultJsonResponse(modulAplikasiService.findAllSubSytemOrderByModulNoUrutAsc(), - mapHeaderMessage); + return defaultJsonResponse(modulAplikasiService.findAllSubSytemOrderByModulNoUrutAsc(), mapHeaderMessage); } - @RequestMapping(value = "/get-all-sub-modul/{kdModulAplikasi:[0-9]+}/show", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-sub-modul/{kdModulAplikasi:[0-9]+}/show", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllSubModul(@PathVariable("kdModulAplikasi") int kdModulAplikasi, HttpServletRequest request) { - // loggingSystemAsynchronous.saveSignInLog(kdModulAplikasi, request, - // null); - return RestUtil.defaultJsonResponse(modulAplikasiService.findAllSubModulOrderByModulNoUrutAsc(kdModulAplikasi)); + return defaultJsonResponse(modulAplikasiService.findAllSubModulOrderByModulNoUrutAsc(kdModulAplikasi)); } - /// OBJEK MODUL = FORM INPUT - @RequestMapping(value = "/get-all-objek-modul/{idUserLogin:[0-9]+}/{kdModulAplikasi:[0-9]+}/show", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllObjekModul(@PathVariable("idUserLogin") int idUserLogin, - @PathVariable("kdModulAplikasi") int kdModulAplikasi) { - try { - // LoginUserVO loginUserVo = loginUserService.findById(idUserLogin); - LoginUser loginUser = loginUserDao.findOne(idUserLogin); - - Pegawai pegawai = loginUser.getPegawai(); - Integer pegawaiId = pegawai.getId(); - - List lVO = mapPegawaiToModulAplikasiService - .findByPegawaiIdAndModulAplikasiId(pegawaiId, kdModulAplikasi); - - if (CommonUtil.isNullOrEmpty(lVO)) { - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses"); - return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage); - } - - return RestUtil.defaultJsonResponse(objekModulAplikasiService.findAllModulAplikasi(kdModulAplikasi)); - - } catch (Exception e) { - LOGGER.info("Got exception {} in get objek modul aplikasi", e); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses"); - return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-all-default-objek-modul", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-default-objek-modul", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllDefaultObjekModulAplikasi() { - return RestUtil - .defaultJsonResponse(objekModulAplikasiService.findByKdObjekModulAplikasiHeadIsNullOrderByNoUrutAsc()); + return defaultJsonResponse(objekModulAplikasiService.findByKdObjekModulAplikasiHeadIsNullOrderByNoUrutAsc()); } - @RequestMapping(value = "/get-all-unit-kerja/{idUserLogin:[0-9]+}/{kdModulAplikasi:[0-9]+}/show", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-unit-kerja/{idUserLogin:[0-9]+}/{kdModulAplikasi:[0-9]+}/show", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllUnitKerjaByUserLogin( @PathVariable("idUserLogin") int idUserLogin, @PathVariable("kdModulAplikasi") int kdModulAplikasi) { try { List> ruangannya = mapLoginUserToRuanganService .findCurrentRoomByUserLoginAndModulAplikasi(idUserLogin, kdModulAplikasi); - - if (CommonUtil.isNullOrEmpty(ruangannya)) { - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses"); - return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage); + if (isNullOrEmpty(ruangannya)) { + addHeaderMessage(ERROR_MESSAGE, "Anda tidak punya izin akses"); + return getJsonHttpStatus(UNAUTHORIZED, mapHeaderMessage); } - - return RestUtil.defaultJsonResponse(ruangannya); + return defaultJsonResponse(ruangannya); } catch (Exception e) { - LOGGER.info("Got exception {} in get objek modul aplikasi", e); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses"); - return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage); + LOGGER.info("Got exception {} in findCurrentRoomByUserLoginAndModulAplikasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, "Anda tidak punya izin akses"); + return getJsonHttpStatus(UNAUTHORIZED, 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(ModulAplikasiVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(ModulAplikasiVO 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/MesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java index 587fb8ec..e1358fda 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.MesinDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MesinService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MesinVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class MesinController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMesin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMesin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -67,11 +66,11 @@ public class MesinController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllMesin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllMesin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -84,11 +83,11 @@ public class MesinController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findMesin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findMesin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -105,11 +104,11 @@ public class MesinController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllMesinLaundry", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllMesinLaundry", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java index 0a105634..008bb6d0 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java @@ -1,52 +1,50 @@ 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.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.vo.MonitoringAlatSterilVO; import com.jasamedika.medifirst2000.service.MonitoringAlatSterilService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.MonitoringAlatSterilVO; +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.RequestParam; +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("/monitoringalatsteril") -public class MonitoringAlatSterilController extends LocaleController { +public class MonitoringAlatSterilController extends LocaleController { + @Autowired private MonitoringAlatSterilService monitoringAlatSterilService; - - @RequestMapping(value="/save-monitoringalatsteril", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveMonitoringAlatSteril( - @RequestBody MonitoringAlatSterilVO vo, HttpServletRequest request){ + + @RequestMapping(value = "/save-monitoringalatsteril", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveMonitoringAlatSteril(@RequestBody MonitoringAlatSterilVO vo, + HttpServletRequest request) { Map result = this.monitoringAlatSterilService.saveMonitoringAlatSterilService(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-monitoringalatsteril", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getMonitoringAlatSteril( - @RequestParam("startDate")String startDate, @RequestParam("endDate")String endDate, HttpServletRequest request) { - Map result = this.monitoringAlatSterilService.getMonitoringAlatSterilService(startDate, endDate); - return result; + + @RequestMapping(value = "/get-monitoringalatsteril", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getMonitoringAlatSteril(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.monitoringAlatSterilService.getMonitoringAlatSterilService(startDate, endDate); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java index 45297f29..22ec6c91 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MonitoringEvaluasiPerundanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -53,11 +52,11 @@ public class MonitoringEvaluasiPerundanganController extends LocaleController { + @Autowired private MonitoringMesinAutoClaveBowidickService monitoringMesinAutoClaveBowidickService; - - @RequestMapping(value="/save-monitoring-mesin-clave-bowidick", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveMonitoringMesin( - @RequestBody MonitoringMesinAutoClaveBowidickVO dto, HttpServletRequest request){ - Map result = this.monitoringMesinAutoClaveBowidickService.saveMonitoringMesinAutoClaveBowidick(dto); + + @RequestMapping(value = "/save-monitoring-mesin-clave-bowidick", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveMonitoringMesin(@RequestBody MonitoringMesinAutoClaveBowidickVO dto, + HttpServletRequest request) { + Map result = this.monitoringMesinAutoClaveBowidickService + .saveMonitoringMesinAutoClaveBowidick(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-monitoring-mesin-clave-bowidick", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getMonitoringTestMesin( - @RequestParam("startDate")String startDate, @RequestParam("endDate")String endDate, HttpServletRequest request) { - Map result = this.monitoringMesinAutoClaveBowidickService.getMonitoringMesinAutoClaveBowidick(startDate, endDate); - return result; + + @RequestMapping(value = "/get-monitoring-mesin-clave-bowidick", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getMonitoringTestMesin(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.monitoringMesinAutoClaveBowidickService.getMonitoringMesinAutoClaveBowidick(startDate, endDate); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java index 709e9444..0e7abf6b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java @@ -2,45 +2,49 @@ package com.jasamedika.medifirst2000.controller; 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.MonitoringTestEntylenOxideService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MonitoringTestEthylenOxideVO; 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.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import 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("/monitoringtestentylenoxide") -public class MonitoringTestEntylenOxideController extends LocaleController{ +public class MonitoringTestEntylenOxideController extends LocaleController { + @Autowired private MonitoringTestEntylenOxideService monitoringTestEntylenOxideService; - - @RequestMapping(value="/save-monitoring-test-entylen-oxide", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveMonitoring( - @RequestBody MonitoringTestEthylenOxideVO dto, HttpServletRequest request){ - Map result = this.monitoringTestEntylenOxideService.saveMonitoringTestEntylenOxideService(dto); + + @RequestMapping(value = "/save-monitoring-test-entylen-oxide", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveMonitoring(@RequestBody MonitoringTestEthylenOxideVO vo, + HttpServletRequest request) { + Map result = this.monitoringTestEntylenOxideService.saveMonitoringTestEntylenOxideService(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-monitoring-test-entylen-oxide", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getMonitoring( - @RequestParam("startDate")String startDate, @RequestParam("endDate")String endDate, HttpServletRequest request) { - Map result = this.monitoringTestEntylenOxideService.getMonitoringTestEntylenOxideService(startDate, endDate); - return result; + + @RequestMapping(value = "/get-monitoring-test-entylen-oxide", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getMonitoring(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.monitoringTestEntylenOxideService.getMonitoringTestEntylenOxideService(startDate, endDate); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java index 1a1f7909..a142c475 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java @@ -2,45 +2,49 @@ package com.jasamedika.medifirst2000.controller; 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.MonitoringTestmesinAutoClaveService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MonitoringTestMesinAutoclaveVO; 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.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import 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("/monitoringtestmesinautoclave") -public class MonitoringTestMesinAutoClaveController extends LocaleController{ +public class MonitoringTestMesinAutoClaveController extends LocaleController { + @Autowired private MonitoringTestmesinAutoClaveService monitoringTestmesinAutoClaveService; - - @RequestMapping(value="/save-monitoring-test-mesin-clave", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-monitoring-test-mesin-clave", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveMonitoringTestMesinClave( - @RequestBody MonitoringTestMesinAutoclaveVO dto, HttpServletRequest request){ - Map result = this.monitoringTestmesinAutoClaveService.saveMonitoringTestMesinAutoClave(dto); + @RequestBody MonitoringTestMesinAutoclaveVO vo, HttpServletRequest request) { + Map result = this.monitoringTestmesinAutoClaveService.saveMonitoringTestMesinAutoClave(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-monitoring-test-mesin-clave", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getMonitoringTestMesinClave( - @RequestParam("startDate")String startDate, @RequestParam("endDate")String endDate, HttpServletRequest request) { - Map result = this.monitoringTestmesinAutoClaveService.getMonitoringTestMesinAutoClave(startDate, endDate); - return result; + + @RequestMapping(value = "/get-monitoring-test-mesin-clave", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getMonitoringTestMesinClave(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.monitoringTestmesinAutoClaveService.getMonitoringTestMesinAutoClave(startDate, endDate); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java index 1427661d..0d3063be 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.NeracaLimbahService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.NeracaLimbahVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class NeracaLimbahController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -65,11 +64,11 @@ public class NeracaLimbahController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -97,11 +96,11 @@ public class NeracaLimbahController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getJumlahJenisLimbahB3ByPeriode", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getJumlahJenisLimbahB3ByPeriode", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java index 6d506ae2..1239b307 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.NilaiNilaiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.NilaiNilaiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -58,11 +57,11 @@ public class NilaiNilaiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addNilaiNilai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addNilaiNilai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java index 95df451e..9e7a8315 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.NotaDinasService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.NotaDinasVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -48,11 +47,11 @@ public class NotaDinasController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addNotaDinas", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addNotaDinas", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -67,11 +66,11 @@ public class NotaDinasController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getNoSurat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getNoSurat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java index caef6b80..6628b719 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ObservasiTransaksiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ObservasiCustomVO; import com.jasamedika.medifirst2000.vo.ObservasiVO; import org.slf4j.Logger; @@ -51,11 +50,11 @@ public class ObservasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java index e0b8b247..67bb8a9a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.LayananService; import com.jasamedika.medifirst2000.service.ObservasiIGDService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.LayananVOCustom; import com.jasamedika.medifirst2000.vo.ObservasiIGDVO; import com.jasamedika.medifirst2000.vo.ObservasiIGDVOCustom; @@ -53,11 +52,11 @@ public class ObservasiIGDController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveObservasiIGD", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveObservasiIGD", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -72,11 +71,11 @@ public class ObservasiIGDController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveLayanan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveLayanan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java index eb96068f..7e2f4e51 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CheckOutOperationService; import com.jasamedika.medifirst2000.service.SignOutOperationService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.CheckOutOperationVO; import com.jasamedika.medifirst2000.vo.SignOutOperationVO; import org.slf4j.Logger; @@ -59,11 +58,11 @@ public class OperationController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSignOutOperationService", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSignOutOperationService", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -79,11 +78,11 @@ public class OperationController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveCheckOutOperationService", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveCheckOutOperationService", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -100,11 +99,11 @@ public class OperationController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getKesadaranCheckOut", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getKesadaranCheckOut", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -121,11 +120,11 @@ public class OperationController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getKelengkapanCheckOut", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getKelengkapanCheckOut", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -143,11 +142,11 @@ public class OperationController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getCheckOutByNoRec", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getCheckOutByNoRec", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -165,11 +164,11 @@ public class OperationController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getCheckOutByNoRecAntrian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getCheckOutByNoRecAntrian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java index aa8cd12f..384f0c80 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.dto.AsetDto; import com.jasamedika.medifirst2000.dto.OrderAmbulanceDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.OrderAmbulanceService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.OrderAmbulanceVO; import com.jasamedika.medifirst2000.vo.PegawaiVO; import org.slf4j.Logger; @@ -53,11 +52,11 @@ public class OrderAmbulanceController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveOrderAmbulance", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveOrderAmbulance", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -70,11 +69,11 @@ public class OrderAmbulanceController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findProdukAmbulance", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findProdukAmbulance", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -87,11 +86,11 @@ public class OrderAmbulanceController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAssetAmbulance", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAssetAmbulance", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -104,11 +103,11 @@ public class OrderAmbulanceController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getSupirAmbulance", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getSupirAmbulance", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java index c2ae41d8..d75b3718 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.OrderGiziService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MapProdukMenuToBahanVO; import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO; import org.slf4j.Logger; @@ -62,11 +61,11 @@ public class OrderGiziController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addAlergi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addAlergi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java index afadf7e2..4eff3ec5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapAnamesisService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapAnamesisVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -54,11 +53,11 @@ public class PapAnamesisController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addAnamesis", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addAnamesis", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java index 4cdac30e..d62de9b1 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapBedahService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapBedahVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -53,11 +52,11 @@ public class PapBedahController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addBedah", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addBedah", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java index 462a93f8..645c4d53 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapCatatanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapCatatanVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -61,11 +60,11 @@ public class PapCatatanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addCatatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addCatatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java index 5cd652cb..b9c2a12f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapEliminasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapEliminasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -54,11 +53,11 @@ public class PapEliminasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addEliminasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addEliminasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java index 71768cff..0344531d 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapGastrointestinalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapGastrointestinalVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -55,11 +54,11 @@ public class PapGastrointestinalController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addGenatalia", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addGenatalia", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -76,11 +75,11 @@ public class PapGenataliaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateGenatalia", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateGenatalia", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java index 5334fc8e..933ca913 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapGigiMulutService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapGigiMulutVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -54,11 +53,11 @@ public class PapGigiMulutController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addGigiMulut", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addGigiMulut", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java index 726d1c91..f8ce4b31 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapGinekologiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapGinekologiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -57,11 +56,11 @@ public class PapGinekologiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addGinekologi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addGinekologi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java index 48fe83d7..b4d0322a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapInstruksiPerjanjianService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapInstruksiPerjanjianVO; import com.jasamedika.medifirst2000.vo.PasienInstruksiPerjanjianVO; import org.slf4j.Logger; @@ -58,11 +57,11 @@ public class PapInstruksiPerjanjianController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addIntegumen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addIntegumen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java index f9789aa8..6f767ea5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapKebutuhanEdukasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapKebutuhanEdukasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class PapKebutuhanEdukasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addMata", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addMata", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java index 193d437b..26399f47 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapMuskuloskeletalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapMuskuloskeletalVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -55,11 +54,11 @@ public class PapMuskuloskeletalController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addNeurologi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addNeurologi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java index 41195f7c..4f3305f9 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapObstetriService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapObstetriVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -59,11 +58,11 @@ public class PapObstetriController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePapObstetri", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePapObstetri", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java index 5bb104ce..2e8145ea 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapPengambilanSpesimenService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapPengambilanSpesimenCustomVO; import com.jasamedika.medifirst2000.vo.PapPengambilanSpesimenVO; import org.slf4j.Logger; @@ -47,11 +46,11 @@ public class PapPengambilanSpesimenController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addPernapasan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addPernapasan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java index d5e0a3ae..a477515d 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapRiwayatImunisasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapRiwayatImunisasiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -53,11 +52,11 @@ public class PapRiwayatImunisasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addSirkulasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addSirkulasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java index 3b056e38..4b45ccaf 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapSkriningGiziService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapSkriningGiziVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -56,11 +55,11 @@ public class PapSkriningGiziController extends LocaleController { - + private static final Logger LOGGER = getLogger(PapStatusFungsionalController.class); @Autowired private PapStatusFungsionalService papStatusFungsionalService; @RequestMapping(value = "/save-status-fungsional", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody PapStatusFungsionalVO vo,HttpServletRequest request) { + public ResponseEntity> save(@Valid @RequestBody PapStatusFungsionalVO vo, + HttpServletRequest request) { try { - Map result = papStatusFungsionalService.addStatusFungsional(vo); - if (null != result){ - mapHeaderMessage.put(LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); + Map result = papStatusFungsionalService.addStatusFungsional(vo); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, CREATED, mapHeaderMessage); - } else{ + } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", "Pasien belum melakukan pendaftaran"); return getJsonResponse(null, CREATED, headerMessageCustom); @@ -55,12 +54,12 @@ public class PapStatusFungsionalController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addTandaVital", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addTandaVital", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java index 2c08166a..d6019c6c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapThtService; import com.jasamedika.medifirst2000.service.ThtService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PapThtVO; import com.jasamedika.medifirst2000.vo.ThtVO; import org.slf4j.Logger; @@ -63,11 +62,11 @@ public class PapThtController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addTht2", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addTht2", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java index a8d17fc3..10b8cf60 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ParameterService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ParameterVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -46,11 +45,11 @@ public class ParameterController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addParameter", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addParameter", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -65,11 +64,11 @@ public class ParameterController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateParameter", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateParameter", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java index ec10a31a..42f31665 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PasienMeninggalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PasienMeninggalVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -54,17 +53,17 @@ public class PasienMeninggalController extends LocaleController> loadRencanaPindah( - @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { + public ResponseEntity> loadRencanaPindah(@RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { Map result = pasienMeninggalService.loadRencanaPindah(noRec); if (null != result) { @@ -76,11 +75,11 @@ public class PasienMeninggalController extends LocaleController> getRuanganByKelas( - @RequestParam(value = "id") Integer id, HttpServletRequest request) { + public ResponseEntity> getRuanganByKelas(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = pasienMeninggalService.getRuanganByKelas(id); if (null != result) { @@ -119,17 +118,17 @@ public class PasienMeninggalController extends LocaleController> getKamarByRuangan( - @RequestParam(value = "id") Integer id, HttpServletRequest request) { + public ResponseEntity> getKamarByRuangan(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = pasienMeninggalService.getKamarByRuangan(id); if (null != result) { @@ -141,11 +140,11 @@ public class PasienMeninggalController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updatepasienPulang", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updatepasienPulang", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java index d9790889..b13353b5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.dto.FileUploadExcelDto; import com.jasamedika.medifirst2000.dto.PayRollDto; import com.jasamedika.medifirst2000.dto.PayRollUangMakanDto; import com.jasamedika.medifirst2000.service.PayRollPegawaiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.StrukHistoriVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -48,7 +47,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pegawai-blu-pkwt", method = POST, produces = APPLICATION_JSON_VALUE) @@ -59,7 +58,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/find-status-pegawai-blu-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) @@ -72,7 +71,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/find-jenis-gaji", method = GET, produces = APPLICATION_JSON_VALUE) @@ -82,7 +81,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-uang-makan-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) @@ -96,7 +95,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/find-status-pegawai-uang-makan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -111,7 +110,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pegawai-uang-makan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -122,7 +121,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/import-uang-makan", method = POST, produces = APPLICATION_JSON_VALUE) @@ -141,10 +140,10 @@ public class PayRollPegawaiController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -157,7 +156,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-harian-lepas-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) @@ -171,7 +170,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pegawai-harian-lepas", method = POST, produces = APPLICATION_JSON_VALUE) @@ -182,7 +181,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/find-status-pegawai-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) @@ -194,7 +193,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-dokter-psikologi-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) @@ -208,7 +207,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-dokter-psikologi-pkwt", method = POST, produces = APPLICATION_JSON_VALUE) @@ -219,7 +218,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/find-rekanan-penjamin-pasien", method = GET, produces = APPLICATION_JSON_VALUE) @@ -229,7 +228,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/find-umr", method = GET, produces = APPLICATION_JSON_VALUE) @@ -240,7 +239,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-premi-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) @@ -254,7 +253,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-premi-asuransi", method = POST, produces = APPLICATION_JSON_VALUE) @@ -265,7 +264,7 @@ public class PayRollPegawaiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java deleted file mode 100644 index 7e65da91..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.List; - -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.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.PayRollReportHarianLepasDto; -import com.jasamedika.medifirst2000.dto.PayRollReportUangMakanDto; -import com.jasamedika.medifirst2000.service.PayRollReportingService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; - -@RestController -@RequestMapping(value="/reporting-pay-roll") -public class PayRollReportingController extends LocaleController { - - @Autowired - private PayRollReportingService payRollReportingService; - - @RequestMapping(value="/uang-makan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> reportUangMakan( - @RequestParam(value="idKategoryPegawai", required = true) Integer idKategoryPegawai, - @RequestParam(value="periode", required = true) String periode, - HttpServletRequest request) { - List result = payRollReportingService.reportUangMakan(idKategoryPegawai, periode); - - if (!result.isEmpty()) { - 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="/harian-lepas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> reportHarianLepas( - @RequestParam(value="idKategoryPegawai", required = true) Integer idKategoryPegawai, - @RequestParam(value="periode", required = true) String periode, - HttpServletRequest request) { - List result = payRollReportingService.reportHarianLepas(idKategoryPegawai, periode); - - if (!result.isEmpty()) { - 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); - } - -} 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 ab3d4197..adfb8972 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,31 +1,20 @@ package com.jasamedika.medifirst2000.controller; -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.*; -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.*; 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; @@ -33,12 +22,23 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.text.SimpleDateFormat; import java.util.Collection; import java.util.HashMap; 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_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 * @@ -46,25 +46,19 @@ import java.util.Map; */ @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; @@ -77,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 dto, + 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(dto.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); + PegawaiVO result = dto.getPegawaiVO(); + 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 f6a97b30..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 @@ -4,7 +4,6 @@ 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.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaDokterDVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class PegawaiJadwalKerjaDokterDController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pegawai-sk-gaji", method = GET, produces = APPLICATION_JSON_VALUE) @@ -48,18 +47,18 @@ public class PegawaiSkGajiController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pegawai-sk-gaji-by-pegawai-id", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getByPegawaiId( - @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { List> result = pegawaiSKGajiService.getByPegawaiId(idPegawai); if (result != null) { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(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 9a0f60ea..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 @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; 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; @@ -39,7 +38,7 @@ public class PegawaiSkPajakController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pekerjaan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getPekerjaan(HttpServletRequest request) { - return this.pekerjaanService.getPekerjaan(); + 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 cdda365f..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 @@ -4,7 +4,6 @@ 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.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PelaksanaVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class PelaksanaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getJenisPetugasPelaksana", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getJenisPetugasPelaksana", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + 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 6cc2f632..9ea2b3f0 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 @@ -4,7 +4,6 @@ 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.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.HargaNettoProdukByKelasVO; import com.jasamedika.medifirst2000.vo.PelatihanBiayaDiklatVO; import org.slf4j.Logger; @@ -20,6 +19,7 @@ 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.*; @@ -46,11 +46,11 @@ public class PelatihanBiayaDiklatController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePelatihanPaket", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePelatihanPaket", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -74,10 +73,9 @@ public class PelatihanPaketController extends LocaleController } @RequestMapping(value = "/detail-pelatihan-paket", method = GET, produces = APPLICATION_JSON_VALUE) - public Map detailPelatihanPaket( - @RequestParam(value = "strukPlanningId") String strukPlanningId, + public Map detailPelatihanPaket(@RequestParam(value = "strukPlanningId") String strukPlanningId, @RequestParam(value = "produkId") Integer produkId) { - return pelatihanPaketService.detailPelatihanPaket(strukPlanningId, 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 67fe241d..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 @@ -4,7 +4,6 @@ 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.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class PelayananAdmixtureController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addPelayananTpn", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addPelayananTpn", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } 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 c149e880..330b9a25 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 @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; 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.PemakaianAirBersihVO; import net.kaczmarzyk.spring.data.jpa.domain.DateBetween; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -51,11 +50,11 @@ public class PemakaianAirBersihController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addPemakaianMesin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addPemakaianMesin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -69,11 +68,11 @@ public class PemakaianMesinController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllPemakaianMesin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllPemakaianMesin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -85,11 +84,11 @@ public class PemakaianMesinController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deletePemakaianMesin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deletePemakaianMesin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } 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 d058fca2..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 @@ -4,7 +4,6 @@ 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.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PemakaianRuangRapatVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -48,11 +47,11 @@ public class PemakaianRuangRapatController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePencucianLinen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePencucianLinen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -67,11 +66,11 @@ public class PencucianLinenController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findMappingCycleDenganBahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findMappingCycleDenganBahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java index 76de668c..fb5c8706 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.StrukPelayananDetailService; import com.jasamedika.medifirst2000.service.StrukPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO; import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO; import com.jasamedika.medifirst2000.vo.StrukPelayananVO; @@ -53,11 +52,11 @@ public class PenerimaanBarangController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when pengkajianAwalTransaksiService.save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when pengkajianAwalTransaksiService.save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -65,11 +64,11 @@ public class PengkajianAwalController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when pengkajianAwalTransaksiService.update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when pengkajianAwalTransaksiService.update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java index 973f8126..d290658c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PengkajianKebutuhanDasarService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PengkajianKebutuhanDasarVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class PengkajianKebutuhanDasarController extends LocaleController> savePengukuranPencahayaan(@Valid @RequestBody PengukuranKebisinganVO vo, HttpServletRequest request) { try { vo.setMenutype("suhu"); Map result = service.savePengukuranSuhu(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 savePengukuranPencahayaan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengukuranPencahayaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePengukuranPencahayaan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePengukuranPencahayaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pengukuran-suhu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pengukuran-suhu", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPengukuranKelembaban(HttpServletRequest request) { try { Map result = service.getPengukuranSuhu(); 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 getPengukuranKebisingan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPengukuranSuhu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPengukuranSuhu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @RequestMapping("/lapPengukuranSuhu") public ModelAndView lapPengukuranSuhu(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { - + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { Map result = this.service.getRepotingPengukurangSuhu(startDate, endDate); - Map header = (Map) result.get("header"); String periode = header.get("startDate") == null ? "" : (String) header.get("startDate"); - periode = periode + (header.get("endDate") == null ? "" : " sd " + (String) header.get("endDate")); + periode = periode + (header.get("endDate") == null ? "" : " sd " + header.get("endDate")); m.addObject("dataSource", result.get("listData")); m.addObject("periode", periode); m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java index 0709bf6b..40b1f53e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PenilaianKinerjaSatpamService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PenilaianKinerjaSatpamVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class PenilaianKinerjaSatpamController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveStrukPlanning", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveStrukPlanning", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -73,11 +72,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPlanningDHM", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPlanningDHM", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -98,11 +97,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getInformasiRencanaPenyuluhan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getInformasiRencanaPenyuluhan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -117,11 +116,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when noPlanning", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when noPlanning", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -136,11 +135,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePesertaPenyuluhan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePesertaPenyuluhan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -154,11 +153,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPesertaPenyuluhanByNoPlanning", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPesertaPenyuluhanByNoPlanning", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -173,11 +172,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePelaksanaanPenyuluhan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePelaksanaanPenyuluhan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -198,11 +197,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPlannDHMHukorByNoPlanningAndDate", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPlannDHMHukorByNoPlanningAndDate", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -220,11 +219,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPlanningDHMHukorByNoPlanning", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPlanningDHMHukorByNoPlanning", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -238,11 +237,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPesertaRegistrasiByNoPlanning", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPesertaRegistrasiByNoPlanning", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -257,11 +256,11 @@ public class PenyuluhanController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRegistrasiPesertaPenyuluhan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRegistrasiPesertaPenyuluhan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java index aa26ca09..4e15b826 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PenyusunanTRPNBPService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PenyusunanTRPNPBVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -60,11 +59,11 @@ public class PenyusunanTRPNBPController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when peranService.save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when peranService.save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java index 9c8f36e3..3e2d5f82 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PeranHubunganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PeranHubunganVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -59,11 +58,11 @@ public class PeranHubunganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addPeranHubungan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addPeranHubungan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java index 3f1a7537..742756eb 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.PeriodePelaporan; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PeriodePelaporanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PeriodePelaporanVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -65,11 +64,11 @@ public class PeriodePelaporanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePerlakuan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePerlakuan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +65,11 @@ public class PerlakuanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPerlakuanAll", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPerlakuanAll", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java index 019224c0..dbf6b513 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PersepsiKognisiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PersepsiKognisiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -59,11 +58,11 @@ public class PersepsiKognisiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addPersepsiPasien", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addPersepsiPasien", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java index d5d1e793..dc6ea384 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.Perspektif; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PerspektifService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PerspektifVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -67,11 +66,11 @@ public class PerspektifController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when perspektifService.save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when perspektifService.save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java index 25a5d344..11c3fc58 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PertanyaanSurveyService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PertanyaanSurveyVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class PertanyaanSurveyController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when inputMouPKS", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when inputMouPKS", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java index a03208ee..2c7e7c75 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PioService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PioVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -46,11 +45,11 @@ public class PioController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePio", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePio", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java index 4ae7658d..5c17d5dc 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PlanningDiklatHumasMarketBiayaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PlanningDiklatHumasMarketBiayaVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class PlanningDiklatHumasMarketBiayaController extends LocaleController

{ } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePphp", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePphp", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java index b305e932..339d9471 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PraAnestesiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PraAnestesiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class PraAnestesiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPasienByRencanaOperasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPasienByRencanaOperasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java index a24d62fe..18f5f48e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PraAnestesiDokterBedahService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PraAnestesiDokterBedahHeaderVO; import com.jasamedika.medifirst2000.vo.PraAnestesiDokterBedahVO; import org.slf4j.Logger; @@ -51,11 +50,11 @@ public class PraAnestesiDokterBedahController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findProdukByDetailJenisProdukAndNamaProduk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findProdukByDetailJenisProdukAndNamaProduk", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -233,11 +232,11 @@ public class ProductController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when detailJenisProduk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when detailJenisProduk", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java index e9cd1039..b1f42460 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ProdukDetailLabAnatomiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ProdukDetailLabAnatomiVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -63,11 +62,11 @@ public class ProdukDetailLabAnatomiController extends LocaleController result = produkKeslingNilaiNormalService .getProdukKeslingNilaiNormalService(jenisPemeriksaanId); - mapHeaderMessage.put(LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getProdukKeslingNilaiNormalService", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getProdukKeslingNilaiNormalService", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java index 44755c9d..78c13636 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ProgramService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ProgramVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -48,11 +47,11 @@ public class ProgramController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addProgram", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addProgram", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java index 7ab3a3e8..95bce316 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.ProgramKerjaStrategis; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ProgramKerjaStrategisService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ProgramKerjaStrategisVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -65,11 +64,11 @@ public class ProgramKerjaStrategisController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveProsesCuci", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveProsesCuci", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +65,11 @@ public class ProsesCuciController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllProsesCuci", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllProsesCuci", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java index f905ab3e..b9282211 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java @@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PsrsPermintaanPerbaikanService; import com.jasamedika.medifirst2000.service.StokProdukGlobalService; import com.jasamedika.medifirst2000.service.StrukOrderService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -62,11 +61,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveOrderRadiologi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveOrderRadiologi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -74,11 +73,11 @@ public class RadiologiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateOrderRadiologi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateOrderRadiologi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -97,11 +96,11 @@ public class RadiologiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getReportByTglCreate", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getReportByTglCreate", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java index e0028abd..fc289da9 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RegistrasiAsetService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO; import com.jasamedika.medifirst2000.vo.HistoryAlatVO; import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; @@ -53,11 +52,11 @@ public class RegistrasiAsetController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDistribusiBarang", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDistribusiBarang", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -72,11 +71,11 @@ public class RegistrasiAsetController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDokumen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDokumen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -109,11 +108,11 @@ public class RegistrasiAsetController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateAset", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateAset", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java index 2f75082e..7775adfd 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java @@ -11,7 +11,6 @@ import com.jasamedika.medifirst2000.service.HasilTriaseService; import com.jasamedika.medifirst2000.service.RegistrasiPasienRawatInapService; import com.jasamedika.medifirst2000.service.RegistrasiPasienService; import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.RegistrasiPasienPenunjangVO; import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO; @@ -72,11 +71,11 @@ public class RegistrasiPasienController extends LocaleController { - @Autowired - private ResumeMedisService resumeMedisService; + private static final Logger LOGGER = getLogger(RegistrasiPelayananController.class); @Autowired private KendaliDokumenRekamMedisService kendaliDokumenRekamMedisService; @@ -52,80 +56,9 @@ public class RegistrasiPelayananController extends LocaleController { @Autowired private RencanaOperasiService rencanaOperasiService; - @Autowired - private StrukOrderService strukOrderService; - @Autowired private BridgingBpjs bridgingBpjs; - @Autowired - private ProdukService produkService; - - @RequestMapping(value = "/save-rencana-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiCustomVO vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = rencanaOperasiService.saveRencanaOperasiNew(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-permintaan-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaOperasiNew(@Valid @RequestBody RencanaOperasiCustomVO vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = rencanaOperasiService.savePermintaanOperasi(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-save-rencana-operasi/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getsaveRencanaOperasi(@PathVariable("nama") String nama, - HttpServletRequest request) { - Map result = null; - try { - if (nama.equals("-")) - nama = ""; - result = rencanaOperasiService.findByName(nama); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - @Autowired private KelompokPasienDao kelompokPasienDao; @@ -133,7 +66,7 @@ public class RegistrasiPelayananController extends LocaleController { private KelompokPasienConverter kelompokPasienConverter; @Autowired - private RegistrasiPelayananService registrasiPelayananService; + private RegistrasiPelayananService registrasiPelayananService; @Autowired private PegawaiService pegawaiService; @@ -141,32 +74,20 @@ public class RegistrasiPelayananController extends LocaleController { @Autowired private AlamatService alamatService; - @Autowired - private PasienDaftarService pasienDaftarService; - @Autowired private AsalRujukanService asalRujukanService; @Autowired - private RuanganService ruanganService; + private RuanganService ruanganService; @Autowired - private PasienService pasienService; - - @Autowired - private AntrianPasienRegistrasiService antrianPasienRegistrasiService; - - @Autowired - private ActivityPegawaiService activityPegawaiService; + private AntrianPasienRegistrasiService antrianPasienRegistrasiService; @Autowired private KelompokPasienService kelompokPasienService; @Autowired - private RegistrasiPasienOnlineService registrasiPasienOnlineService; - - @Autowired - private StatusKemandirianService statusKemandirianService; + private RegistrasiPasienOnlineService registrasiPasienOnlineService; @Autowired private PersetujuanUmumService persetujuanUmumService; @@ -178,84 +99,117 @@ public class RegistrasiPelayananController extends LocaleController { private OrderProdukService orderProdukService; @Autowired - private PemakaianAsuransiService pemakaianAsuransiService; - - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; + private RegistrasiPelayananPasienService registrasiPelayananPasienService; @Autowired private AntrianPasienDiPeriksaService antrianPasienDiperiksaService; + @Autowired private PapInformasiIbuService papInformasiIbuService; + @Autowired private PapPengambilanSpesimenService papPengambilanSpesimenService; + @Autowired private RuanganDao ruanganDao; - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); + @Autowired + private StrukOrderDao strukOrderDao; - @RequestMapping(value = "/save-pap-informasi-ibu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @Autowired + private BaseConverterImpl strukOrderConverter; + + @Autowired + private PelayananObatService pelayananObatService; + + @Autowired + private DokumenRekamMedisService dokumenRekamMedisService; + + @Autowired + private PelayananPasienService pelayananPasienService; + + @Autowired + private MappingPasienPacsDao mappingPasienPacsDao; + + @Autowired + private PasienDaftarDao pasienDaftarDao; + + @Autowired + private DaftarStrukPenjualanService service; + + @Autowired + private JadwalDpjpRawatInapService jadwalDpjpRawatInapService; + + @RequestMapping(value = "/save-rencana-operasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiCustomVO vo, + HttpServletRequest request) { + try { + Map result = rencanaOperasiService.saveRencanaOperasiNew(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when saveRencanaOperasiNew", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveRencanaOperasiNew", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/save-pap-informasi-ibu", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo, HttpServletRequest request) { try { Map result = papInformasiIbuService.savePapInformasiIbu(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 savePapInformasiIbu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePapInformasiIbu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePapInformasiIbu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when savePapInformasiIbu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-kirim-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kirim-produk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKirimProduk(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map result = orderProdukService.saveKirimProduk(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianLaboratorium", "noRec"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 saveKirimProduk", 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 saveKirimProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-order-produk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderProduk(@Valid @RequestBody OrderProdukVO vo, HttpServletRequest request) throws ParseException { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - else - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); + vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); Map result = orderProdukService.saveOrderProduk(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianLaboratorium", "noRec"); String permintaan = ""; - if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) { + if (isNotNullOrEmpty(vo.getRuangan())) { Ruangan ruangan = ruanganDao.findOne(vo.getRuangan().getId()); if (ruangan.getNamaRuangan().equals("Bank Darah")) permintaan = "Bank Darah"; @@ -264,583 +218,313 @@ public class RegistrasiPelayananController extends LocaleController { if (ruangan.getNamaRuangan().equals("Ruang Gizi")) permintaan = "Ruang Gizi"; } else { - if (CommonUtil.isNotNullOrEmpty(vo.getDetailRadiologi())) { + if (isNotNullOrEmpty(vo.getDetailRadiologi())) { permintaan = "Radiologi"; } else { permintaan = "Laboratorium"; } } - SaveLog("Order " + permintaan, "Permintaaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 saveOrderProduk", 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 saveOrderProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @Autowired - private StrukOrderDao strukOrderDao; - - @Autowired - private BaseConverterImpl strukOrderConverter; - - @RequestMapping(value = "/struk-order", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/struk-order", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveStrukOrder(@Valid @RequestBody StrukOrderVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - StrukOrder strukOrder = new StrukOrder(); strukOrder = strukOrderConverter.transferVOToModel(vo, strukOrder); - Map result = new HashMap(); + Map result; try { result = strukOrderDao.save(strukOrder).ToMap(); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when save", 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 save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-laboratorium-for-device-list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderLaboratoriumByDevice( - @Valid @RequestBody HeaderDetailHasilDeviceVO vo, - - HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.saveOrderLaboratoriumForDevice(vo); - BroadcastMessage("ResultLabDevice", result.get("message").toString()); - 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-order-from-sirs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-from-sirs", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderFromSirs( @RequestParam(value = "dateStart", required = false) String dateStart, - @RequestParam(value = "dateEnd", required = false) String dateEnd, - - HttpServletRequest request) throws ParseException { + @RequestParam(value = "dateEnd", required = false) String dateEnd, HttpServletRequest request) { try { - - Date from = DateUtil.toDate(dateStart); - Date until = DateUtil.toDate(dateEnd); + Date from = toDate(dateStart); + Date until = toDate(dateEnd); Map result = orderProdukService.getOrderFromSirs(from, until); - BroadcastMessage("ResultLabDevice", result.get("message").toString()); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + BroadcastMessage(result.get("message")); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + 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 getOrderFromSirs", 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 getOrderFromSirs", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-laboratorium-for-device", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderLaboratoriumByDevice( - @RequestParam(value = "noOrder") String noOrder, @RequestParam(value = "noSample") String noSample, - @RequestParam(value = "noDetailPemeriksaan") Integer noDetailPemeriksaan, - @RequestParam(value = "hasil") String hasil, @RequestParam(value = "komen") String komen, - - HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.saveOrderLaboratoriumForDevice(noOrder, noSample, - noDetailPemeriksaan, hasil, komen); - BroadcastMessage("ResultLabDevice", result.get("message").toString()); - 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-order-laboratorium-for-device", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderLaboratoriumByDevice( - @RequestParam(value = "noOrder") String noOrder, HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.getOrderLaboratoriumForDevice(noOrder); - 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-hasil-laboratorium", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-hasil-laboratorium", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveHasilLaboratorium(@RequestParam(value = "noOrder") String noOrder, - @Valid @RequestBody List vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody List vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - for (HasilPemeriksaanVO subModel : vo) { - format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - } - Map result = orderProdukService.saveHasilPelayanan(noOrder, 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveHasilPelayanan", 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 saveHasilPelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-surat-permintaan-masuk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-surat-permintaan-masuk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveSuratPermintaanMasuk(@Valid @RequestBody SuratPermintaanMasukVO vo, HttpServletRequest request) throws ParseException { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) + if (vo.getTanggalPendaftaran().contains("-")) vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); else vo.setTglRegistrasi(new Date(Long.parseLong(vo.getTanggalPendaftaran()))); Map result = suratPermintaanMasukService.saveSuratPermintaanMasuk(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSuratPermintaanMasuk", 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 saveSuratPermintaanMasuk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-status-kemandirian", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveStatusKemandirian(@Valid @RequestBody StatusKemandirianVO vo, - HttpServletRequest request) throws ParseException { - try { - PasienDaftarVO pasienDaftar = new PasienDaftarVO(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - else - vo.setTglRegistrasi(new Date(Long.parseLong(vo.getTanggalPendaftaran()))); - Map result = statusKemandirianService.saveStatusKemandirian(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @Autowired - private PelayananObatService pelayananObatService; - - // - @RequestMapping(value = "/save-verifikasi-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-verifikasi-pelayanan-obat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveVerifikasiPelayananObat(@Valid @RequestBody MainPelayananDetailVO vo, HttpServletRequest request) { try { Map result = pelayananObatService.saveVerifikasiPelayananObat3(vo); - if (CommonUtil.isNotNullOrEmpty(result)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + if (isNotNullOrEmpty(result)) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", "Tidak ada stok"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveVerifikasiPelayananObat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveVerifikasiPelayananObat3", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveVerifikasiPelayananObat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveVerifikasiPelayananObat3", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pengambil-order/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pengambil-order/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePengambilOrder(@Valid @RequestBody StrukOrderVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map result = pelayananObatService.savePengambilOrder(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengambilOrder", 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 savePengambilOrder", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/update-status-order/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-status-order/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> updateStatusOrder(@RequestParam(value = "noOrder") String noOrder, - @RequestParam(value = "status") Byte status, HttpServletRequest request) throws ParseException { + @RequestParam(value = "status") Byte status, HttpServletRequest request) { try { Map result = orderProdukService.updateStatusOrder(noOrder, status); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateStatusOrder", 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 updateStatusOrder", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) - throws ParseException { + @RequestMapping(value = "/save-pelayanan-obat/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) { try { - if (CommonUtil.isNotNullOrEmpty(vo.getTanggalPendaftaran())) { - vo.setTglRegistrasi(DateUtil.toDate(vo.getTanggalPendaftaran())); - } + if (isNotNullOrEmpty(vo.getTanggalPendaftaran())) + vo.setTglRegistrasi(toDate(vo.getTanggalPendaftaran())); Map result = pelayananObatService.savePelayananObat3(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Farmasi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 savePelayananObat3", 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 savePelayananObat3", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-pasien-daftar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPasienDaftarn( - @RequestParam(value = "noCm", required = false) String noCm, - @RequestParam(value = "tanggal", required = false) String tanggal) { - PasienDaftar resultPageMap = pasienDaftarDao.findByNoRec(noCm); - - try { - return RestUtil.getJsonResponse(resultPageMap.ToMap(), HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-antrian-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAntrianPasien( - @RequestParam(value = "noRec", required = false) String noRec) { - AntrianPasienDiperiksaDto resultPageMap = antrianPasienDiperiksaService.findAntrian(noRec).get(0); - - try { - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-antrian-pasien-schedule/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAntrianPasienSchedule( - @RequestParam(value = "idRuangan", required = false) Integer idRuangan) { - List resultPageMap = pasienDaftarService.getFindSchedule(idRuangan); - - try { - return RestUtil.getJsonResponse(JsonUtil.ToMaps(resultPageMap), HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); - } - - @Autowired - private DokumenRekamMedisService dokumenRekamMedisService; - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-dokumen-rekammedis/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-dokumen-rekammedis/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDokumenRekamMedis( @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "namaPasien", required = false) String namaPasien) { - List resultPageMap = dokumenRekamMedisService.getByRuangan(idRuangan, - DateUtil.toDate(dateStart), DateUtil.toDate(dateEnd), namaPasien); - + List resultPageMap = dokumenRekamMedisService.getByRuangan(idRuangan, toDate(dateStart), + toDate(dateEnd), namaPasien); try { - return RestUtil.getJsonResponse(JsonUtil.ToMaps(resultPageMap), HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(ToMaps(resultPageMap), OK, mapHeaderMessage); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/terima-dokumen-rekammedis/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/terima-dokumen-rekammedis/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> terimaDokumenRekamMedis( @RequestParam(value = "listTerimaDokumen", required = false) String listTerimaDokumen) { - String[] dokumens = new String[listTerimaDokumen.split(",").length]; - dokumens = listTerimaDokumen.split(","); + String[] dokumens = listTerimaDokumen.split(","); List resultPageMap = dokumenRekamMedisService.terimaDokumen(dokumens); - try { - return RestUtil.getJsonResponse(JsonUtil.ToMaps(resultPageMap), HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(ToMaps(resultPageMap), OK, mapHeaderMessage); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } - @RequestMapping(value = "/kirim-dokumen-rekammedis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/kirim-dokumen-rekammedis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> kirimDokumenRekamMedis(@Valid @RequestBody List vo, HttpServletRequest request) { try { - Map result = dokumenRekamMedisService.kirimDokumen(vo); - // Map - // result=registrasiPasienOnlineService.saveRegistrasiPasienOnline(vo); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianPerjanjian", result.get("noRec").toString()); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 kirimDokumen", 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 kirimDokumen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-order-pelayanan-obat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-order-pelayanan-obat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findOrderPelayananObat( @RequestParam(value = "ruanganId", required = false) Integer ruanganId, @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = pelayananObatService.findOrderPelayanan(ruanganId, DateUtil.toDate(dateStart), - DateUtil.toDate(dateEnd), noCm); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + List resultPageMap = pelayananObatService.findOrderPelayanan(ruanganId, toDate(dateStart), + toDate(dateEnd), noCm); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/updateStok/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity updateStok(@RequestParam(value = "noRec", required = false) String noRec) { - PelayananPasien resultPageMap = pelayananObatService.updateStok(noRec); - try { - BroadcastMessage(resultPageMap.getNoRec(), resultPageMap.ToMap().toString()); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(true, HttpStatus.CREATED, mapHeaderMessage); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-kartu-stok/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKartuStok( - @RequestParam(value = "id", required = false) Integer id) { - List> data = null; - try { - data = JsonUtil.ToMaps(pelayananObatService.getKartuStok(id)); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(data, HttpStatus.OK); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-monitoring/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getMonitoring( - @RequestParam(value = "id", required = false) Integer id) { - List> data = null; - try { - data = JsonUtil.ToMaps(activityPegawaiService.getData()); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(data, HttpStatus.OK); - } - - // - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan-obat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-obat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananObat( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = pelayananObatService.getOrderPelayanan3(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan-all/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-all/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananAll( @RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = pelayananObatService.getPelayanan(noRec); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @Autowired - private PelayananPasienService pelayananPasienService; - - @RequestMapping(value = "/delete-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-order-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> deleteOrderPelayanan(@Valid @RequestBody List> vo, HttpServletRequest request) { try { Map result = pelayananPasienService.deletePelayanan(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 deleteOrderPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deletePelayanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when deleteOrderPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deletePelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan-by-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-by-pegawai/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananByPegawai( @RequestParam(value = "noRec", required = false) String noRec, @RequestParam(value = "idPegawai", required = false) String idPegawai) { Map resultPageMap = pelayananObatService.getPelayanan(noRec, idPegawai); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-ruangan-pelayanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-ruangan-pelayanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findRuanganPelayanan( @RequestParam(value = "noRec", required = false) String noRec) { - Map resultPageMap = new HashMap();// pelayananObatService.findRuanganPelayanan(noRec); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + Map resultPageMap = new HashMap<>(); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-billing/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-billing/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getBilling( @RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = pelayananObatService.getPelayanan(noRec); - Map map = new HashMap<>(); - Double totalBiling = 0.0; - Double totalKlaim = 0.0; + double totalBiling = 0.0; for (Map item : (List>) resultPageMap.get("orders")) { Map produk = (Map) item.get("produk"); if ((Short) produk.get("nilaiNormal") != 0) @@ -849,60 +533,59 @@ public class RegistrasiPelayananController extends LocaleController { } map.put("totalBilling", totalBiling); map.put("totalDeposit", pelayananObatService.getTotalDeposite(noRec)); - map.put("totalKlaim", 0); - return RestUtil.getJsonResponse(map, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(map, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayanan( @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map resultPageMap = pelayananObatService.getOrderPelayanan(noRegistrasi); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @RequestMapping(value = "/save-touch-screen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPasienOnline(@Valid @RequestBody AntrianDto antrian, + @RequestMapping(value = "/save-touch-screen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRegistrasiPasienOnline(@Valid @RequestBody AntrianDto dto, HttpServletRequest request) { try { - - AntrianPasienRegistrasiVO vo = new AntrianPasienRegistrasiVO(); - vo.setTipePasien(TipePasienEnum.BARU.getVal()); - PasienVO pasien = new PasienVO(); - pasien.setNamaPasien("Pasien Baru"); - vo.setType("BARU"); - vo.setJenis(antrian.getJenis()); - vo.setTglReservasi(new Date()); - vo.setStatusPanggil("0"); - JenisKelaminVO jenisKelamin = new JenisKelaminVO(); - jenisKelamin.setId(0); - vo.setJenisKelamin(jenisKelamin); - PendidikanVO pendidikan = new PendidikanVO(); - pendidikan.setId(0); - vo.setPendidikan(pendidikan); - vo.setPasien(pasien); + AntrianPasienRegistrasiVO vo = getAntrianPasienRegistrasiVO(dto); Map result = registrasiPasienOnlineService.saveRegistrasiPasienTouchScreen(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); + } + 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 saveRegistrasiPasienTouchScreen", 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 saveRegistrasiPasienTouchScreen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-touch-old-screen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + private static AntrianPasienRegistrasiVO getAntrianPasienRegistrasiVO(AntrianDto dto) { + AntrianPasienRegistrasiVO vo = new AntrianPasienRegistrasiVO(); + vo.setTipePasien(TipePasienEnum.BARU.getVal()); + PasienVO pasien = new PasienVO(); + pasien.setNamaPasien("Pasien Baru"); + vo.setType("BARU"); + vo.setJenis(dto.getJenis()); + vo.setTglReservasi(new Date()); + vo.setStatusPanggil("0"); + JenisKelaminVO jenisKelamin = new JenisKelaminVO(); + jenisKelamin.setId(0); + vo.setJenisKelamin(jenisKelamin); + PendidikanVO pendidikan = new PendidikanVO(); + pendidikan.setId(0); + vo.setPendidikan(pendidikan); + vo.setPasien(pasien); + return vo; + } + + @RequestMapping(value = "/save-touch-old-screen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRegistrasTouchScreen( @Valid @RequestBody AntrianPasienRegistrasiVO vo, HttpServletRequest request) { try { @@ -917,90 +600,58 @@ public class RegistrasiPelayananController extends LocaleController { kelompokPasienDao .findById(Integer.parseInt(GetSettingDataFixed("KdKelompokPasienAsuransi"))), new KelompokPasienVO())); - } else + } else { data.setKelompokPasien(vo.getJenisPasien()); + } data.setRuangan(vo.getPoliTujuan()); data.setPasien(vo.getPasien()); - data.setPegawai(vo.getDokter()); data.setTglRegistrasi(vo.getTglReservasi()); - data.setRuangan(vo.getPoliTujuan()); - Map result = registrasiPelayananService.savePasienTouchScreen(data); - // Map - // result=registrasiPasienOnlineService.saveRegistrasiPasienOnline(vo); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianPerjanjian", result.get("noRec").toString()); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 savePasienTouchScreen", 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 savePasienTouchScreen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePelayanan(@Valid @RequestBody List vo, HttpServletRequest request) { - try { - Map resultPageMap = pelayananObatService.savePelayanan2(vo); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - - } - return null; + Map resultPageMap = pelayananObatService.savePelayanan2(vo); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @RequestMapping(value = "/save-pelayanan-2", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayanan2(@Valid @RequestBody List vo, - HttpServletRequest request) { - try { - Map resultPageMap = pelayananObatService.savePelayanan(vo); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - - } - return null; - } - - @RequestMapping(value = "/get-list-pasien-daftar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pasien-daftar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPasienDaftar(@RequestParam(value = "start") String start, - @RequestParam(value = "until") String until, - - HttpServletRequest request) { + @RequestParam(value = "until") String until, HttpServletRequest request) { try { - Map result = registrasiPelayananService.getPasienDaftar(DateUtil.toDate(start), - DateUtil.toDate(until)); + Map result = registrasiPelayananService.getPasienDaftar(toDate(start), toDate(until)); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPasienDaftar", 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 getPasienDaftar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/ambil-hasil-laboratorium", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/ambil-hasil-laboratorium", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveAmbilHasilLaboratorium( @RequestParam(value = "tanggal") String tanggal, @RequestParam(value = "namaPengambil") String namaPengambil, @@ -1008,161 +659,135 @@ public class RegistrasiPelayananController extends LocaleController { HttpServletRequest request) { try { Map result = registrasiPelayananService.ambilHasil(noOrder, namaPengambil, noTelepon, - DateUtil.toDate(tanggal)); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + toDate(tanggal)); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); + } + 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 ambilHasil", 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 ambilHasil", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-registrasi-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-registrasi-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePasien(@Valid @RequestBody RegistrasiPelayananVO vo, HttpServletRequest request) { try { Map result = registrasiPelayananService.savePasienDafar(vo); - if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { + if (isNullOrEmpty(result.get("statusPasien"))) { try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); } catch (Exception ex) { - ex.getMessage(); + throw new ServiceVOException(ex.getMessage()); } - 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); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePasienDafar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePasienDafar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-persetujuan-umum", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-persetujuan-umum", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePersetujuanUmum(@Valid @RequestBody PersetujuanUmumVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - // if (vo.getTanggalPendaftaran().indexOf("-") > -1) - // vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - // else - // vo.setTglRegistrasi(new - // Date(Long.parseLong(vo.getTanggalPendaftaran()))); Map result = persetujuanUmumService.savePersetujuanUmum(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePersetujuanUmum", 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 savePersetujuanUmum", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getData(@RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = registrasiPasienOnlineService.getPasienDaftarByNoRec(noRec); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @RequestMapping(value = "/get-order-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderLaboratorium( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderLaboratorium(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-darah/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-darah/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderDarah( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrder(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-pelayanan-darah/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pelayanan-darah/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPelayananDarah( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getDataPelayananDarah(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderRadiologi( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderRadiologi(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-histori-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-histori-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataOrderHistoryLaboratorium( @RequestParam(value = "tglOrder", required = false) String tglOrder, @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "noCm", required = false) String noCm) { long val = Long.parseLong(tglOrder); Date date = new Date(val); - List> resultPageMap = registrasiPelayananService.getOrderHistoryLaboratorium(date, id, noCm); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/hasil-laporan-by-pemeriksaan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/hasil-laporan-by-pemeriksaan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllReportPemeriksaan( @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "id", required = false) Integer id) { List> resultPageMap = registrasiPelayananService.getLaporanHailPemeriksaan(dateStart, dateEnd, id); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-detail-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-detail-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderDetailLaboratorium( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderDetailLaboratorium(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @Autowired - private MappingPasienPacsDao mappingPasienPacsDao; - - @RequestMapping(value = "/mapaping-pasien-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/mapaping-pasien-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveMappingPacs(@RequestParam(value = "id", required = false) String id, @RequestParam(value = "noMr", required = false) String noMr, @RequestParam(value = "noRec", required = false) String noRec) { @@ -1175,35 +800,24 @@ public class RegistrasiPelayananController extends LocaleController { AntrianPasienDiPeriksa pasienDaftar = new AntrianPasienDiPeriksa(); pasienDaftar.setNoRec(noRec); mappingPasienPacs.setPasienDaftar(pasienDaftar); - Map resultPageMap = new HashMap<>(); + Map resultPageMap; try { resultPageMap = mappingPasienPacsDao.save(mappingPasienPacs).ToMap(); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-detail-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataOrderDetailRadioilogi( - @RequestParam(value = "noOrder", required = false) String noOrder) { - Map resultPageMap = registrasiPelayananService.getOrderRadiologi(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); - } - - @RequestMapping(value = "/get-order-detail/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-detail/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderDetail( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderDetail(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-baru-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllNewVOWithQueryString( + @RequestMapping(value = "/antrian-pasien-baru-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllNewVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1214,110 +828,73 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "namaPasien", required = false) String namaPasien) { Map resultPageMap = registrasiPasienOnlineService.findAllAntrianBaruPagingList(page, limit, sort, dir, ruanganId, dateStart, dateEnd, namaPasien); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/get-all-dokter", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-dokter", method = GET) public ResponseEntity> getAllDokter(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 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 getAllDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-dokter-name", method = RequestMethod.GET) - public ResponseEntity> getAllDokterByName( - @RequestParam(value = "filter[filters][0][value]", required = false) String value, - HttpServletRequest request) { - try { - String data = request.getQueryString(); - data = URLDecoder.decode(data); - String[] arrQueries = data.split("&"); - String values = null; - for (String query : arrQueries) { - if (query.indexOf("filter[filters][0][value]") >= 0) { - if (values == null) - values = query.replace("filter[filters][0][value]=", ""); - else - values += "," + query.replace("filter[filters][0][value]=", ""); - } - } - List listPegawaiVo = pegawaiService.getAllDokter(values); - 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-asal-rujukan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-asal-rujukan", method = GET) public ResponseEntity> getAllAsalRujukan(HttpServletRequest request) { try { List listAsalRujukanVO = asalRujukanService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listAsalRujukanVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listAsalRujukanVO, 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 findAll", 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 findAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-ruangan-rawat-inap", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan-rawat-inap", method = GET) public ResponseEntity> getAllRuanganRawatInap(HttpServletRequest request) { try { List listRuanganVO = ruanganService .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRawatInap"); List listRuanganVO2 = ruanganService .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRawatInapBayi"); - for (RuanganVO ruanganVo : listRuanganVO2) - listRuanganVO.add(ruanganVo); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); + listRuanganVO.addAll(listRuanganVO2); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listRuanganVO, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error( + "Got ServiceVOException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiRawat,KdDepartemenInstalasiRawatInapBayi]", + e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error( + "Got JpaSystemException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiRawat,KdDepartemenInstalasiRawatInapBayi]", + jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-ruangan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan", method = GET) public ResponseEntity> getAllRuangan(HttpServletRequest request) { try { List listRuanganVO = ruanganService.findRuanganByDepartemen(); - List list = new ArrayList(); + List list = new ArrayList<>(); RuanganVO ruanganVo; for (RuanganVO vo : listRuanganVO) { ruanganVo = new RuanganVO(); @@ -1330,147 +907,21 @@ public class RegistrasiPelayananController extends LocaleController { ruanganVo.setDepartemenId(vo.getDepartemenId()); list.add(ruanganVo); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(list, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-ruangan-detail", method = RequestMethod.GET) - public ResponseEntity> getAllRuanganDetail(HttpServletRequest request) { - try { - List listRuanganVO = ruanganService.findRuanganByDepartemenDetail(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-all-ruangan-penunjang", method = RequestMethod.GET) - public ResponseEntity> getAllRuanganPenunjang(HttpServletRequest request) { - try { - List listRuanganTemp = new ArrayList(); - List listRuanganVO = ruanganService - .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiLaboratorium"); - listRuanganTemp.addAll(listRuanganVO); - listRuanganVO = ruanganService.findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRadiologi"); - listRuanganTemp.addAll(listRuanganVO); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganTemp, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-all-kelompok-pasien", method = RequestMethod.GET) - public ResponseEntity> getAllKelompokPasien(HttpServletRequest request) { - try { - List listKelompokPasienVO = kelompokPasienService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listKelompokPasienVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get KelompokPasien", 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 KelompokPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-all-alamat", method = RequestMethod.GET) - public ResponseEntity> getAllAlamat(HttpServletRequest request) { - try { - List listAlamatVO = alamatService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listAlamatVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Alamat", 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 Alamat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-cm", method = RequestMethod.GET) - public ResponseEntity getCm(HttpServletRequest request) { - try { - String noCm = pasienService.generatePasienCM(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(noCm, HttpStatus.OK, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-all-pasien", method = RequestMethod.GET) - public ResponseEntity> getAllPasien(HttpServletRequest request) { - try { - List listPasienVO = pasienService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPasienVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllRadiologiVOWithQueryString( + @RequestMapping(value = "/antrian-pasien-list-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllRadiologiVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1483,28 +934,22 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "asalRuanganId", required = false) Integer asalRuanganId, @RequestParam(value = "tglLahir", required = false) Date tglLahir, @RequestParam(value = "namaPasien", required = false) String namaPasien) { - if (noCm.equals("-")) { + if (noCm.equals("-")) noCm = null; - } Map resultPageMap = registrasiPelayananService.findAllAntrianPaging(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir); - return constructListPageResult(resultPageMap); } - @SuppressWarnings("unchecked") - - @RequestMapping(value = "/sum-antrian-registrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/sum-antrian-registrasi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity sumAntrianRegistrasi( - @RequestParam(value = "pasienId", required = false) Integer pasienId) { Integer resultPageMap = antrianPasienRegistrasiService.countAntrian(pasienId); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap, OK, mapHeaderMessage); } - @RequestMapping(value = "/antrian-pasien-penunjang-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOPenunjangWithQueryString( + @RequestMapping(value = "/antrian-pasien-penunjang-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOPenunjangWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "1000") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1516,12 +961,10 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingPenunjangList(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, null, null, null); - return constructListPageResult(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/antrian-pasien-list/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @@ -1536,78 +979,21 @@ public class RegistrasiPelayananController extends LocaleController { Map result = registrasiPelayananService.findAllAntrianPaging(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); 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 getAllVOWithQueryString", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllAntrianPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllVOWithQueryString", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllAntrianPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-gizi-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllAntrianPasienGizi( - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - @RequestParam(value = "namaRuangan", required = false) String namaRuangan, - @RequestParam(value = "dateStart", required = false) String dateStart, - @RequestParam(value = "dateEnd", required = false) String dateEnd, - @RequestParam(value = "noCm", required = false) String noCm, - @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId, HttpServletRequest request) { - - try { - Map result = registrasiPelayananService.findAllAntrianPasienGiziPaging(ruanganId, - namaRuangan, dateStart, dateEnd, noCm, pegawaiId); - 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 getAllAntrianPasienGizi", 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 getAllAntrianPasienGizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - // @SuppressWarnings("unchecked") - // @RequestMapping(value = "/antrian-pasien-penunjang-list/", method = - // RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - // public ResponseEntity> getAllVOWithQueryPenunjang( - // @RequestParam(value = "page", required = false, defaultValue = "1") - // Integer page, - // @RequestParam(value = "limit", required = false, defaultValue = "50") - // Integer limit, - // @RequestParam(value = "sort", required = false, defaultValue = "noRec") - // String sort, - // @RequestParam(value = "dir", required = false, defaultValue = "asc") - // String dir, - // @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - // @RequestParam(value = "dateStart", required = false) String dateStart, - // @RequestParam(value = "dateEnd", required = false) String dateEnd, - // @RequestParam(value = "noCm", required = false) String noCm, - // @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { - // Map resultPageMap = - // registrasiPelayananService.findAllAntrianPenunjangPaging(page, limit, - // sort, - // dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); - // - // return constructListPageResult(resultPageMap); - // } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-bpjs-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBpjsWithQueryString( + @RequestMapping(value = "/antrian-bpjs-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getBpjsWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1618,189 +1004,101 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findBpjsAntrianPaging(page, limit, sort, dir, dateStart, dateEnd, noCm, pegawaiId); - return constructListPageResult(resultPageMap); } - @Autowired - private PasienDaftarDao pasienDaftarDao; - - /* - * @RequestMapping(value = "/save-upload-image", method = - * RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes - * = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUploadImage(@Valid @RequestBody UploadVO vo, - * - * @RequestParam(value = "noOrder", required = true) String noOrder, - * HttpServletRequest request) throws ParseException { try { - * - * return - * RestUtil.getJsonResponse(orderProdukService.saveUploadImage(noOrder,vo)); - * - * } catch (ServiceVOException e) { LOGGER.error( - * "Got exception {} when add Pasien", e.getMessage()); - * addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - * return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - * mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error( - * "Got exception {} when add Pasien", jse.getMessage()); - * addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - * return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - * } - * - * } - */ - - @RequestMapping(value = "/get-nomor-registrasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-nomor-registrasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity getNoRegistrasi(@Valid @RequestBody PemakaianAsuransiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - return RestUtil.getJsonResponse(pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), - vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi()) - .getNoRegistrasi(), HttpStatus.ACCEPTED); - + return getJsonResponse( + pasienDaftarDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasienDaftar().getPasien().getId(), + vo.getPasienDaftar().getTglRegistrasi()).getNoRegistrasi(), + ACCEPTED); } 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 finByNoIdAndTglRegistrasi", 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 finByNoIdAndTglRegistrasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-histori-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-histori-pasien/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findHistoryRiwayatOrder( @RequestParam(value = "noRec", required = false) String noRec, @RequestParam(value = "code", required = false) String code) { List> resultPageMap = antrianPasienDiperiksaService.findAntrianByPasienDaftar(noRec, code); - return RestUtil.getJsonResponse(resultPageMap); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-histori-radiolgi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-histori-radiolgi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findByAntrianByPasienDaftar( @RequestParam(value = "noRec", required = false) String noRec) { List> resultPageMap = antrianPasienDiperiksaService.findAntrianByPasienDaftar(noRec, "R"); - return RestUtil.getJsonResponse(resultPageMap); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-pelayanan-rawat-jalan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPelayananRawatJalan( + @RequestMapping(value = "/get-pelayanan-rawat-jalan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getPelayananRawatJalan( @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = registrasiPelayananService.findPealyananRawatJalan(Short.parseShort("0"), - noCm); - return RestUtil.getJsonResponse(resultPageMap); - // return constructListPageResult(resultPageMap); + List> resultPageMap = registrasiPelayananService.findPealyananRawatJalan((short) 0, noCm); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-registrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-registrasi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRegistrasi( @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map result = registrasiPelayananService.findPasienDaftarById(noRegistrasi); - return RestUtil.getJsonResponse(result); + return getJsonResponse(result); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/update-status-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-status-antrian/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> upateStatusAntrian( - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "statusAntrian", required = true) String statusAntrian, - @RequestParam(value = "tglDipanggilSuster", required = true) String tglDipanggilSuster, - @RequestParam(value = "tglDipanggilDokter", required = true) String tglDipanggilDokter, - HttpServletRequest request) { - + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "statusAntrian") String statusAntrian, + @RequestParam(value = "tglDipanggilSuster") String tglDipanggilSuster, + @RequestParam(value = "tglDipanggilDokter") String tglDipanggilDokter, HttpServletRequest request) { try { Map result = registrasiPelayananService.updatStatusAntrian(noRegistrasi, statusAntrian, tglDipanggilSuster, tglDipanggilDokter); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); BroadcastMessage("DashboardLaboratorium", "noRec"); BroadcastMessage("DaftarAntrian", "noRec"); 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)); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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 updatStatusAntrian", 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 updatStatusAntrian", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-persetujuan-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPersetujuanRawatInap( + @RequestMapping(value = "/get-persetujuan-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getPersetujuanRawatInap( @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = registrasiPelayananService.findPersetujuanUmum(Short.parseShort("0"), - noCm); - return RestUtil.getJsonResponse(resultPageMap); + List> resultPageMap = registrasiPelayananService.findPersetujuanUmum((short) 0, noCm); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-pelayanan-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPelayananRawatInap( + @RequestMapping(value = "/get-pelayanan-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getPelayananRawatInap( @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = registrasiPelayananService.findPelayananRawatInap(Short.parseShort("0"), - noCm); - return RestUtil.getJsonResponse(resultPageMap); + List> resultPageMap = registrasiPelayananService.findPelayananRawatInap((short) 0, noCm); + return getJsonResponse(resultPageMap); } - @RequestMapping(value = "/search-get-all-ruangan", method = RequestMethod.GET) - public ResponseEntity> getSearchAllRuangan( - @RequestParam(value = "namaRuangan", required = false) String namaRuangan, HttpServletRequest request) { - try { - List listRuanganVO = ruanganService.findRuanganByDepartemenByName(namaRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/search-get-all-ruangan-rehab-medik", method = RequestMethod.GET) - public ResponseEntity> getSearchAllRuanganRehabMedik( - @RequestParam(value = "namaRuangan", required = false) String namaRuangan, HttpServletRequest request) { - try { - List listRuanganVO = ruanganService.findRuanganRehamMedik(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Ruangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Ruangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - // Report @RequestMapping("/kartuPasien") public ModelAndView generateKartuPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "id") Integer id) { @@ -1809,333 +1107,143 @@ public class RegistrasiPelayananController extends LocaleController { m.addObject("tanggalReport", new Date()); m.addObject("title", "Kartu Pasien"); m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { m.addObject("format", format); } - return m; } @RequestMapping("/reportReservasi") public ModelAndView generaterReportReservasi(ModelAndView m, @RequestParam(value = "noRec", required = false) String noRec) { - - AntrianPasienRegistrasi antrian = (AntrianPasienRegistrasi) antrianPasienRegistrasiService.findOne(noRec); - List listPasien = new ArrayList(); - listPasien.add(antrian); - - m.addObject("dataSource", listPasien); + AntrianPasienRegistrasi antrian = antrianPasienRegistrasiService.findOne(noRec); + List listAntrian = new ArrayList<>(); + listAntrian.add(antrian); + m.addObject("dataSource", listAntrian); m.addObject("tanggalReport", new Date()); m.addObject("title", "Report Registrasi Pasien"); m.addObject("tanggalReservasi", antrian.getTglReservasi()); m.addObject("format", "pdf"); - return m; } @RequestMapping("/gelangPasien") public ModelAndView generateGelangPasien(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "id", required = true) Integer id) { - + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "id") Integer id) { List list = registrasiPelayananPasienService.findPasien(id); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Kartu Pasien"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - - return m; - } - - @RequestMapping("/kunjunganPelayananReport") - public ModelAndView generateKunjunganPelayanan(ModelAndView m, - @RequestParam(value = "format", required = false) String format) { - - /* - * List list = - * registrasiPelayananPasienService.findAllPasien(); - * m.addObject("dataSource", list); m.addObject("tanggalReport", new - * Date()); m.addObject("title", "Report Kunjungan Pelayanan"); - * m.addObject("format", "pdf"); - */ - - if (format != null && !format.isEmpty()) { - m.addObject("format", format); - } - return m; } @RequestMapping("/slipAntrian") public ModelAndView generateSlipAntrian(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { - + @RequestParam(value = "noRec") String noRec) { List list = registrasiPelayananPasienService.findAntrian(noRec); - m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Slip Antrian"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - - return m; - } - - @RequestMapping("/antrianPasienReservasi") - public ModelAndView generateAntrianPasienReservasi(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { - - List list = registrasiPelayananPasienService.findAntrian(noRec); - - m.addObject("dataSource", list); - m.addObject("tanggalReport", new Date()); - m.addObject("title", "Antrian Pasien Reservasi"); - m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { - m.addObject("format", format); - } - return m; } @RequestMapping("/etiketPersetujuanUmum") public ModelAndView generateEtiketPersetujuanUmum(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglRegistrasi", required = true) String tglRegistrasi) { - + @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noCm") String noCm, + @RequestParam(value = "tglRegistrasi") String tglRegistrasi) { List list = persetujuanUmumService.findEtiket(noCm, tglRegistrasi); - m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Etiket"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } @RequestMapping("/antrianPasienDiperiksa") public ModelAndView generateAntrianPasienDiperiksa(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { - - List list = antrianPasienDiperiksaService.findAntrian(noRec); + @RequestParam(value = "noRec") String noRec) { + List list = antrianPasienDiperiksaService.findAntrian(noRec); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Antrian Pasien Diperiksa"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } - // ---------------------------------add by - // Pratama-----------------------------// - - @RequestMapping(value = "/report-detail-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/report-detail-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ModelAndView reportOrderDetailLaboratorium(ModelAndView m, @RequestParam(value = "noOrder", required = false) String noOrder, @RequestParam(value = "format", required = false) String format) { - - List list = new ArrayList(); - StrukOrder strukOrder = registrasiPelayananService.getStrukOrderByNoOrder(noOrder); - list = registrasiPelayananService.getHasilPemeriksaanByNoOrder(noOrder); - List dtos = new ArrayList(); - + List list = registrasiPelayananService.getHasilPemeriksaanByNoOrder(noOrder); + List dtos = new ArrayList<>(); Alamat alamatPasien = alamatService.findByPasienId2(strukOrder.getNoCm().getId()); - Integer usia = new Date( - strukOrder.getNoCm().getTglDaftar().getTime() - strukOrder.getNoCm().getTglLahir().getTime()).getYear() - - 70; + int selisihTahunSaatDaftar = DateUtil.getYear( + new Date(strukOrder.getNoCm().getTglDaftar().getTime() - strukOrder.getNoCm().getTglLahir().getTime())); + Integer usia = selisihTahunSaatDaftar - 70; Date now = new Date(); - PapPengambilanSpesimen papPengambilanSpesimen = papPengambilanSpesimenService .findByNoOrderAndTglOrder2(strukOrder.getNoOrder(), strukOrder.getTglOrder()); - for (HasilPemeriksaan hasilPemeriksaan : list) { HasilLaboratoriumDto hasilLaboratoriumDto = new HasilLaboratoriumDto(); hasilLaboratoriumDto.setStrukOrder(strukOrder); hasilLaboratoriumDto.setUsia(usia); - // updated - // hasilLaboratoriumDto.setOrdersList(new - // ArrayList()); - // hasilLaboratoriumDto.setDetails(new - // ArrayList()); - // hasilLaboratoriumDto.getOrdersList().add(hasilPemeriksaan); - // end updated hasilLaboratoriumDto.setOrders(hasilPemeriksaan); hasilLaboratoriumDto.setAlamatPasien(alamatPasien); hasilLaboratoriumDto.setTanggalCetak(now); hasilLaboratoriumDto.setSpesimen(papPengambilanSpesimen); Set listNilaiNormal = hasilPemeriksaan.getDetail() .getProdukNilaiNormal(); - - System.out.println(listNilaiNormal.size()); - for (ProdukDetailLaboratoriumNilaiNormal data : listNilaiNormal) { - System.out.println(data.getId()); - System.out.println(data.getJenisKelamin().getJenisKelamin()); - if (data.getJenisKelamin().getJenisKelamin() == strukOrder.getNoCm().getJenisKelamin() - .getJenisKelamin()) { + for (ProdukDetailLaboratoriumNilaiNormal data : listNilaiNormal) + if (Objects.equals(data.getJenisKelamin().getJenisKelamin(), + strukOrder.getNoCm().getJenisKelamin().getJenisKelamin())) if (data.getAgeMin() < usia && data.getAgeMax() > usia) { - System.out.println(data.getRefRange()); - // hasilLaboratoriumDto.getDetails().add(data); hasilLaboratoriumDto.setDetail(data); break; } - } - } - dtos.add(hasilLaboratoriumDto); - } m.addObject("dataSource", dtos); m.addObject("tanggalCetak", new Date()); m.addObject("title", "Report Hasil Lab"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } - // -------------------------------end add by - // Pratama---------------------------// - @RequestMapping("/asuransiBPJS") - public ModelAndView reportAsuransiBPJS(ModelAndView m, - @RequestParam(value = "noSep", required = true) String noSep) { - - List list = pemakaianAsuransiService.findByNoSep(noSep); - SuratEligibilitasAsuransiDto temp = (SuratEligibilitasAsuransiDto) list.get(0); - String tgl = DateUtil.formatDate(temp.getRegistrasiPelayananPasien().getPasien().getTglLahir()); - String tglReport = DateUtil.formatDate(new Date()); - m.addObject("tanggalReport", tglReport); - m.addObject("tanggalLahir", tgl); - m.addObject("title", "SURAT ELIGIBILITAS PESERTA"); - m.addObject("dataSource", list); - m.addObject("tanggalReport", new Date()); - m.addObject("title", "Asuransi BPJS"); - m.addObject("format", "pdf"); - - return m; - } - - // add by askur 03112016 - @RequestMapping(value = "/get-kelompok-pasien", method = RequestMethod.GET) + @RequestMapping(value = "/get-kelompok-pasien", method = GET) public ResponseEntity> getKelompokPasien(HttpServletRequest request) { try { List list = kelompokPasienService.findKelompokPasien(); if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(list, 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 findKelompokPasien", 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 findKelompokPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - // - - // add by askur 14112016 - @RequestMapping(value = "/get-ruangan-bilik", method = RequestMethod.GET) - public ResponseEntity getRuanganBilik( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, - @RequestParam(value = "tglRegistrasi", required = false) Date tglRegistrasi, HttpServletRequest request) { - try { - Ruangan list = registrasiPelayananService.findRuanganBilik(ruanganId, tglRegistrasi); - if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, 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); - } - - } - // - - // add by askur 22112016 - @RequestMapping(value = "/change-pegawai-rawat-inap", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity copyRecords( - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, HttpServletRequest request) - throws ParseException { - try { - AntrianPasienDiPeriksa result = registrasiPelayananService.setPegawaiRawatInap(noRec, idPegawai); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Informasi Ibu", "Pemeriksaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - // - // add by askur 14112016 - @RequestMapping(value = "/get-pemeriksaan-sering-laboratorium", method = RequestMethod.GET) - public ResponseEntity> getPemeriksaanSeringLaboratorium(HttpServletRequest request) { - try { - Map list = registrasiPelayananService.getPemeriksaanSeringLaboratorium(1); - if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, 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); - } - - } - - // - // add by askur 16122016 - @RequestMapping(value = "/antrian-pasien-pulang-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllAntrianPasienPulangList( + @RequestMapping(value = "/antrian-pasien-pulang-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllAntrianPasienPulangList( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -2147,14 +1255,11 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findAllAntrianPasienPulangPaging(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); - return constructListPageResult(resultPageMap); } - // - - @RequestMapping(value = "/antrian-pasien-list-rawat-jalan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryStringRawatJalan( + @RequestMapping(value = "/antrian-pasien-list-rawat-jalan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOWithQueryStringRawatJalan( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -2166,12 +1271,11 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingRawatJalan(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/antrian-pasien-list-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryStringRawatInap( + @RequestMapping(value = "/antrian-pasien-list-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOWithQueryStringRawatInap( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "500") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -2184,1036 +1288,574 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingRawatInap(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, noRegistrasi); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/get-akomodasi-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAkomodasiRawatInap( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { - Map list = produkService.setAkomodasiRawatInap(noRec); - if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); - } - - @RequestMapping(value = "/get-history-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getHistoryPelayanan(HttpServletRequest request) { - try { - Map result = pelayananObatService.getHistoryPelayanan(); - 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 getHistoryPelayanan", 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 getHistoryPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-history-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateHistoryPelayanan( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { - try { - Map result = pelayananObatService.updateHistoryPelayanan(noRec); - 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 updateHistoryPelayanan", 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 updateHistoryPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-jenis-pembiayaan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jenis-pembiayaan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJenisPembiayaan(HttpServletRequest request) { try { Map result = registrasiPelayananService.getKelompokPasien(); 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 getRekananPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getKelompokPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getRekananPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getKelompokPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-rekanan-by-kelompok-user", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekanan-by-kelompok-user", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRekananByKelompokPasien( @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { try { Map result = registrasiPelayananService.getRekananByKelompokPasien(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 registrasiPelayananService", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getRekananByKelompokPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when registrasiPelayananService", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getRekananByKelompokPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-data-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-data-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData( @RequestParam(value = "rekananId", required = false) Integer rekananId, @RequestParam(value = "noCm", required = false) String noCm, HttpServletRequest request) { try { Map result = registrasiPelayananService.getLoadData(rekananId, noCm); 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 getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataAsuransi(@RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "noCm", required = false) String noCm, HttpServletRequest request) { try { Map result = registrasiPelayananService.getDataAsuransiPasien(id, noCm); 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 getDataAsuransiPasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getDataAsuransiPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAsuransiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getDataAsuransiPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-data-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo, HttpServletRequest request) { try { Map result = registrasiPelayananService.saveAsuransiPasien(vo); - if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { + if (isNullOrEmpty(result.get("statusPasien"))) { try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); } catch (Exception ex) { - ex.getMessage(); + throw new ServiceVOException(ex.getMessage()); } - 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); } else { Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + headerMessageCustom.put("label-success", result.get("statusPasien").toString()); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete - // sep - // that - // has - // been - // created - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveAsuransiPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete - // sep - // that - // has - // been - // created - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveAsuransiPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pelayanan-obat-luar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pelayanan-obat-luar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePelayananObatLuar(@Valid @RequestBody PelayananObatLuarVO vo, HttpServletRequest request) { try { Map result = pelayananObatService.savePelayananObatLuar(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 savePelayananObatLuar", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePelayananObatLuar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePelayananObatLuar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePelayananObatLuar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @Autowired - private DaftarStrukPenjualanService service; - - @RequestMapping(value = "/save-retur-penjualan-bebas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-retur-penjualan-bebas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveReturPenjualanBebas(@Valid @RequestBody StrukPelayananVO vo, HttpServletRequest request) { try { Map result = service.returStrukPenjualanBebas(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 saveReturPenjualanBebas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when returStrukPenjualanBebas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveReturPenjualanBebas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when returStrukPenjualanBebas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-verifikasi-pelayanan-obat-luar/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveVerifikasiPelayananObatLuar(HttpServletRequest request) - throws ParseException { - try { - MainPelayananDetailVO vo = (MainPelayananDetailVO) this.getItem(request, new MainPelayananDetailVO()); - Map result = pelayananObatService.saveVerifikasiPelayananObatLuar(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-pelayanan-obat-luar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pelayanan-obat-luar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPenjualanBebas( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { try { Map result = pelayananObatService.getPenjualanBebas(startDate, endDate); 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 getDataAsuransiPasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPenjualanBebas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAsuransiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPenjualanBebas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-produk-penjualan-bebas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-produk-penjualan-bebas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getProdukPenjualanBebas( @RequestParam(value = "noRecStrukPelayanan", required = false) String noRecStrukPelayanan, HttpServletRequest request) { try { Map result = pelayananObatService.getProdukPenjualanBebas(noRecStrukPelayanan); 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 getDataAsuransiPasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getProdukPenjualanBebas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAsuransiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getProdukPenjualanBebas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/find-struk-resep-obat-luar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findStrukResepObatLuar( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) - throws ParseException { - try { - Map result = pelayananObatService.findStrukResepObatLuar(noRec); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-ambil-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveAmbilObat( - @RequestParam(value = "noRec", required = false) String noRec, - @RequestParam(value = "tglAmbilObat", required = false) String tglAmbilObat, - @RequestParam(value = "namaPengambil", required = false) String namaPengambil, - @RequestParam(value = "namaPemberi", required = false) String namaPemberi, HttpServletRequest request) - throws ParseException { - try { - Map result = pelayananObatService.saveAmbilObat(noRec, DateUtil.toDate(tglAmbilObat), - namaPengambil, namaPemberi); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-pelayanan-obat-only-resep/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayananObatOnlyResep(HttpServletRequest request) - throws ParseException { - try { - PelayananObatOnlyResepVO vo = (PelayananObatOnlyResepVO) this.getItem(request, - new PelayananObatOnlyResepVO()); - Map result = pelayananObatService.savePelayananObatOnlyResep(vo); - boolean dataFound = (boolean) result.get("dataFound"); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-siklus-gizi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderGizi(@Valid @RequestBody SiklusGiziVO vo, - HttpServletRequest request) { - try { - Map result = orderProdukService.findSiklusGizi(vo); - 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 getSiklusGizi", 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 getSiklusGizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-order-gizi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderGizi(HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/save-order-gizi", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveOrderGizi(HttpServletRequest request) { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); Map result = orderProdukService.saveOrderPelayananGizi(vo); 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)); SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveOrderPelayananGizi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveOrderPelayananGizi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-order-pelayanan-gizi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderPelayananGizi( - @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate, - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) - throws ParseException { - try { - Map result = orderProdukService.getOrderPelayananGizi(); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-order-pelayanan-gizi-makanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderPelayananGiziMakanan( - @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate, - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - @RequestParam(value = "jenisWaktuId", required = false) Integer jenisWaktuId, HttpServletRequest request) - throws ParseException { - try { - Map result = orderProdukService.getOrderPelayananGiziMakanan(ruanganId, jenisWaktuId, - DateUtil.toDate(startDate), DateUtil.toDate(endDate)); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-order-pelayanan-gizi-minuman/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-gizi-minuman/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananGiziMinuman( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - @RequestParam(value = "jenisWaktuId", required = false) Integer jenisWaktuId, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "jenisWaktuId", required = false) Integer jenisWaktuId, HttpServletRequest request) { try { Map result = orderProdukService.getOrderPelayananGiziMinuman(ruanganId, jenisWaktuId, - DateUtil.toDate(startDate), DateUtil.toDate(endDate)); + toDate(startDate), toDate(endDate)); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 getOrderPelayananGiziMinuman", 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 getOrderPelayananGiziMinuman", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-gizi-menu-tambahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getGiziMenuTambahan(HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/get-gizi-menu-tambahan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getGiziMenuTambahan(HttpServletRequest request) { try { Map result = orderProdukService.findProdukGiziMenuTambahan(); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findProdukGiziMenuTambahan", 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 findProdukGiziMenuTambahan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-komposisi-makanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-komposisi-makanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKomposisiMakanan( @RequestParam(value = "produkId", required = false) Integer produkId, - @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) { try { Map result = orderProdukService.getKomposisiMakanan(produkId, kelasId); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getKomposisiMakanan", 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 getKomposisiMakanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-kalori/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kalori/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKalori( @RequestParam(value = "produkId", required = false) Integer produkId, - @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) { try { Map result = orderProdukService.getKomposisiMakanan(produkId, kelasId); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getKomposisiMakanan get-kalori", 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 getKomposisiMakanan get-kalori", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-komposisi-formula/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-komposisi-formula/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKomposisiFormula( @RequestParam(value = "produkId", required = false) Integer produkId, - @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) { try { Map result = orderProdukService.getKomposisiMakanan(produkId, kelasId); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getKomposisiMakanan get-komposisi-formula", 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 getKomposisiMakanan get-komposisi-formula", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-pemesanan-bahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pemesanan-bahan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPemesananBahan( - @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) { try { - List list = new ArrayList(); + List list = new ArrayList<>(); String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } + for (String s : produkId) + list.add(Integer.valueOf(s)); Map result = orderProdukService.getPemesananBahan(list); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPemesananBahan", 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 getPemesananBahan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-produksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getProduksi( - @RequestParam(value = "noRecOrders", required = true) String noRecOrder, HttpServletRequest request) - throws ParseException { + @RequestMapping(value = "/get-produksi", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getProduksi(@RequestParam(value = "noRecOrders") String noRecOrder, + HttpServletRequest request) { try { - List list = new ArrayList(); String[] noRecOrderL = noRecOrder.split(","); - for (int i = 0; i < noRecOrderL.length; i++) { - list.add(noRecOrderL[i]); - } + List list = new ArrayList<>(Arrays.asList(noRecOrderL)); Map result = orderProdukService.getProduksi(list); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getProduksi", 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 getProduksi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-produksi-bahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getProduksiBahan( - @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) - throws ParseException { - try { - List list = new ArrayList(); - String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } - Map result = orderProdukService.getProduksiBahan(list); - 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-tindakan-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-tindakan-pelayanan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getTindakanPelayanan( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { try { Map result = registrasiPelayananService.getTindakanPelayanan(noRec); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Tindakan", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} getTindakanPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} getTindakanPelayanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} getTindakanPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} getTindakanPelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-order-kirim-menu/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataOrderKirimMenu( - @RequestParam(value = "noRecStrukOrder", required = false) String noRecStrukOrder) { - Map resultPageMap = orderProdukService.getOrderKirimMenu(noRecStrukOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); - } - - @RequestMapping(value = "/get-kirim-menu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getKirimMenu( - @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) - throws ParseException { - try { - List list = new ArrayList(); - String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } - Map result = orderProdukService.getKirimMenu(list); - 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-kirim-menu-gizi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getKirimMenuGizi( - @RequestParam(value = "produks", required = false) String produks, - @RequestParam(value = "noRecOrders", required = false) String noRecOrder, - @RequestParam(value = "jenisWaktus", required = false) String jenisWaktus, HttpServletRequest request) - throws ParseException { - try { - List list = new ArrayList(); - String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } - List list2 = new ArrayList(); - String[] jenisWaktuId = jenisWaktus.split(","); - for (int i = 0; i < jenisWaktuId.length; i++) { - list2.add(Integer.valueOf(jenisWaktuId[i])); - } - List list3 = new ArrayList(); - String[] noRecOrderL = noRecOrder.split(","); - for (int i = 0; i < noRecOrderL.length; i++) { - list3.add(noRecOrderL[i]); - } - Map result = orderProdukService.getKirimMenuGizi(list, list3, list2); - 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-verifikasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-verifikasi", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> saveVerifikasi(@RequestBody List dtos, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { List> result = orderProdukService.saveVerifikasiGiziAll(dtos); if (result != null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Produk Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); + return getJsonResponse(null, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveVerifikasiGiziAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveVerifikasiGiziAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pemesanan-bahan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePemesananBahan( - @RequestParam(value = "noRecOrder", required = false) String noRecOrder, - @RequestParam(value = "jenisWaktuId", required = false) Integer jenisWaktuId, HttpServletRequest request) - throws ParseException { - try { - Map result = orderProdukService.savePemesananBahanGizi(noRecOrder, jenisWaktuId); - boolean dataFound = (boolean) result.get("dataFound"); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Produk Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", 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 order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/cek-produksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> cekProduksi(HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/cek-produksi", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> cekProduksi(HttpServletRequest request) { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); List> result = orderProdukService.cekStokGiziProduksi(vo); if (result != null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Cek Produk Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); + return getJsonResponse(null, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when cekStokGiziProduksi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when cekStokGiziProduksi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-produksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProduksi(HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/save-produksi", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProduksi(HttpServletRequest request) { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); Map result = orderProdukService.saveProduksi(vo); 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)); SaveLog("Produk Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveProduksi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveProduksi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-kirim-menu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveKirimMenu(HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/save-kirim-menu", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveKirimMenu(HttpServletRequest request) { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); Map result = orderProdukService.saveKirimMenu(vo); 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)); SaveLog("Kirim Menu Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKirimMenu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKirimMenu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-kirim-menu-gizi-makanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kirim-menu-gizi-makanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKirimMenuGiziMakanan( - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) { try { Map result = orderProdukService.getOrderPelayananKirimMenuGiziMakanan(ruanganId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 getOrderPelayananKirimMenuGiziMakanan", 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 getOrderPelayananKirimMenuGiziMakanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-kirim-menu-gizi-minuman/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kirim-menu-gizi-minuman/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKirimMenuGiziMinuman( - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) { try { Map result = orderProdukService.getOrderPelayananKirimMenuGiziMinuman(ruanganId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 getOrderPelayananKirimMenuGiziMinuman", 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 getOrderPelayananKirimMenuGiziMinuman", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-order-laborat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-laborat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderLaborat( - @RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) { try { Map result = orderProdukService.getOrder(noOrder); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get order", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getOrder", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get order", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getOrder", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-produk-lab", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-order-produk-lab", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderProdukLab( @RequestParam(value = "cito", required = false, defaultValue = "0") int cito, @Valid @RequestBody OrderProdukVO vo, HttpServletRequest request) throws ParseException { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - else - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); + vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); Map result = orderProdukService.saveOrderProduklab(vo, cito); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianLaboratorium", "noRec"); String permintaan = ""; - if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) { + if (isNotNullOrEmpty(vo.getRuangan())) { Ruangan ruangan = ruanganDao.findOne(vo.getRuangan().getId()); if (ruangan.getNamaRuangan().equals("Bank Darah")) permintaan = "Bank Darah"; @@ -3222,127 +1864,108 @@ public class RegistrasiPelayananController extends LocaleController { if (ruangan.getNamaRuangan().equals("Ruang Gizi")) permintaan = "Ruang Gizi"; } else { - if (CommonUtil.isNotNullOrEmpty(vo.getDetailRadiologi())) { + if (isNotNullOrEmpty(vo.getDetailRadiologi())) { permintaan = "Radiologi"; } else { permintaan = "Laboratorium"; } } - SaveLog("Order " + permintaan, "Permintaaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add order lab", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveOrderProduklab", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add order lab", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveOrderProduklab", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/delete-order-laborat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> hapusOrderLab( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) - throws ParseException { + @RequestMapping(value = "/delete-order-laborat", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> hapusOrderLab(@RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { - Map result = orderProdukService.deleteOrderlaboratorium(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 deleting order", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deleteOrderlaboratorium", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when deleting order", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deleteOrderlaboratorium", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-tambahan-order", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-tambahan-order", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderLaborat( @RequestParam(value = "cito", required = false, defaultValue = "0") int cito, - @Valid @RequestBody Map map, HttpServletRequest request) throws ParseException { + @Valid @RequestBody Map map, HttpServletRequest request) { try { - Map result = orderProdukService.updateOrderProduklab(map, cito); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order ", "Ubah order laboratorium"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateOrderProduklab", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when order", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updateOrderProduklab", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-produk-produksi-gizi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-produk-produksi-gizi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getProdukProduksiGizi( - @RequestParam(value = "menu", required = false) String menu, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "menu", required = false) String menu, HttpServletRequest request) { try { List> result = orderProdukService.getAllProdukProduksiGizi(menu); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 getAllProdukProduksiGizi", 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 getAllProdukProduksiGizi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/jenis-produk/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jenis-produk/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJenisProdukRadiologi(HttpServletRequest request) { - try { List> result = registrasiPelayananService.findJenisProdukRadiologi(); 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 getAllAntrianPasienRadiologi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findJenisProdukRadiologi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllAntrianPasienRadiologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findJenisProdukRadiologi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list-radiologi-new/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllRadiologiVONewWithQueryString( + @RequestMapping(value = "/antrian-pasien-list-radiologi-new/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllRadiologiVONewWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -3356,217 +1979,112 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "tglLahir", required = false) Date tglLahir, @RequestParam(value = "namaPasien", required = false) String namaPasien, @RequestParam(value = "jenisProduk", required = false) String jenisProduk) { - if (noCm.equals("-")) { + if (noCm.equals("-")) noCm = null; - } Map resultPageMap = registrasiPelayananService.findAllAntrianPagingByPemeriksaan(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir, jenisProduk); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/save-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-operasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = rencanaOperasiService.saveOperasi(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveOperasi", 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 saveOperasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-rencana-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getRencanaOperasi(@PathVariable("noRec") String noRec, - HttpServletRequest request) { - - Map result = null; - try { - - result = rencanaOperasiService.getRencanaOperasiByNorec(noRec); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/save-batal-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveBatalOperasi(@Valid @RequestBody RencanaOperasiVO vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = rencanaOperasiService.savePembatalanOperasi(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-permintaan-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-permintaan-operasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllPermintaanOperasi(HttpServletRequest request) { - - List> result = null; try { - - result = rencanaOperasiService.getPermintaanOperasi(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = rencanaOperasiService.getPermintaanOperasi(); + 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); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-rencana-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-rencana-operasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllRencanaOperasi(HttpServletRequest request) { - - List> result = null; try { - - result = rencanaOperasiService.getRencanaOperasi(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = rencanaOperasiService.getRencanaOperasi(); + 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); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-permintaan-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-permintaan-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPermintaanOperasiByNoCmAndDate( @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, @PathVariable("noCm") String noCm, HttpServletRequest request) { - - List> result = null; try { - - result = rencanaOperasiService.getPermintaanOperasi(startDate, endDate, noCm); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = rencanaOperasiService.getPermintaanOperasi(startDate, endDate, noCm); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-rencana-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rencana-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getRencanaOperasiByNoCmAndDate( @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, @PathVariable("noCm") String noCm, HttpServletRequest request) { - - List> result = null; try { - - result = rencanaOperasiService.getRencanaOperasi(startDate, endDate, noCm); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = rencanaOperasiService.getRencanaOperasi(startDate, endDate, noCm); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-permintaan-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-permintaan-operasi/{noRec}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPermintaanOperasi(@PathVariable("noRec") String noRec, HttpServletRequest request) { - - Map result = null; try { - - result = rencanaOperasiService.getPermintaanOperasiByNorec(noRec); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + Map result = rencanaOperasiService.getPermintaanOperasiByNorec(noRec); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/update-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = strukOrderService.updateOrderPelayanan(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + throw new ServiceVOException(e.getMessage()); } } - @RequestMapping(value = "/update-dokter-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-dokter-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> updateDokterPelayanan(@Valid @RequestBody Map vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = registrasiPelayananService.updatePelayananDokter(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updatePelayananDokter", 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 updatePelayananDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @Autowired - private JadwalDpjpRawatInapService jadwalDpjpRawatInapService; - @RequestMapping(value = "/get-dokter-jadwal-dpjp") @ResponseBody public List> getLoadDataDpjp(@RequestParam(value = "id", required = false) Integer id) { @@ -3579,254 +2097,153 @@ public class RegistrasiPelayananController extends LocaleController { return jadwalDpjpRawatInapService.deleteDokterDpjp(noRec); } - @RequestMapping(value = "/save-resume-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addResumeMedis(@Valid @RequestBody ResumeMedisVO vo, - HttpServletRequest request) throws ParseException { - try { - Map result = resumeMedisService.saveResumeMedis(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-resume-medis/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getResumeMedis(@PathVariable("noRec") String noRec, - HttpServletRequest request) { - - Map result = null; - try { - - result = resumeMedisService.getResumeMedis(noRec); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-ruangan-igd", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-ruangan-igd", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getResumeMedis(HttpServletRequest request) { - - List> result = null; try { - - result = registrasiPelayananService.getRuanganIGD(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = registrasiPelayananService.getRuanganIGD(); + 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-data-pasien-daftar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-pasien-daftar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPasienDaftar( @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { try { Map result = registrasiPelayananService.getDataRegistrasiPelayanan(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 getDataAsuransiPasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getDataRegistrasiPelayanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAsuransiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getDataRegistrasiPelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/edit-registrasi-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/edit-registrasi-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> editPasien(@Valid @RequestBody RegistrasiPelayananVO vo, HttpServletRequest request) { try { Map result = registrasiPelayananService.editPasienDaftar(vo); - if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { + if (isNullOrEmpty(result.get("statusPasien"))) { try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); } catch (Exception ex) { - ex.getMessage(); + throw new ServiceVOException(ex.getMessage()); } - 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); } else { Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + headerMessageCustom.put("label-success", result.get("statusPasien").toString()); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when editPasienDaftar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when editPasienDaftar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/edit-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/edit-data-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> editAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo, HttpServletRequest request) { try { Map result = registrasiPelayananService.editAsuransiPasien(vo); - if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { + if (isNullOrEmpty(result.get("statusPasien"))) { try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); } catch (Exception ex) { - ex.getMessage(); + throw new ServiceVOException(ex.getMessage()); } - 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); } else { Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + headerMessageCustom.put("label-success", result.get("statusPasien").toString()); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when editAsuransiPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when editAsuransiPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/test-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> testNoAntrian( - @RequestParam(value = "idRuangan", required = false) Integer idRuangan) { - Integer result = antrianPasienDiperiksaService.getFormatNumberByMonthYearBilik(idRuangan); - Map resultPageMap = new HashMap(); - resultPageMap.put("noAntrian", result); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); - } - - @SuppressWarnings("deprecation") - @RequestMapping(value = "/find-obat", method = RequestMethod.GET) + @RequestMapping(value = "/find-obat", method = GET) public ResponseEntity> findObatProduk( @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, HttpServletRequest request) { - String data = request.getQueryString(); - data = URLDecoder.decode(data); - String criteria = ""; - String values = ""; - String[] arrQueries = data.split("&"); - for (String query : arrQueries) { - if (query.indexOf("filter[filters][0][filter][field]") >= 0) { - if (criteria == null) - criteria = query.replace("filter[filters][0][filter][field]=", ""); - else - criteria += query.replace("filter[filters][0][filter][field]=", ""); - } else if (query.indexOf("filter[filters][0][value]") >= 0) { - if (values == null) - values = query.replace("filter[filters][0][value]=", ""); - else - values += query.replace("filter[filters][0][value]=", ""); - } - } List resultPageMap = registrasiPelayananService.findDiagnosaByKode(kodeDiagnosa); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); + return getJsonResponse(resultPageMap, OK); } - @RequestMapping(value = "/get-data-mapping", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataMapping( - @RequestParam(value = "idKelas", required = false) Integer idKelas, HttpServletRequest request) { - try { - Map result = registrasiPelayananService.getListProduk(idKelas); - 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 getDataAsuransiPasien", 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 getDataAsuransiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-kendali-dokumen-rekam-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kendali-dokumen-rekam-medis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKendaliDokumenRekamMedis( @Valid @RequestBody KendaliDokumenRekamMedisVO vo, HttpServletRequest request) { try { Map result = kendaliDokumenRekamMedisService.saveKendaliDokumenRekamMedis(vo); - if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + if (isNotNullOrEmpty(result.get("norec"))) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + headerMessageCustom.put("label-success", result.get("statusPasien").toString()); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save kendali dokumen rekam medis", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKendaliDokumenRekamMedis", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save kendali dokumen rekam medis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKendaliDokumenRekamMedis", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-antrian-kendali-dokumen-RM", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-antrian-kendali-dokumen-RM", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataMapping( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { try { List> result = registrasiPelayananService.getListAntrian(noCm, startDate, endDate); - 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 getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListAntrian", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListAntrian", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-kendali-dokumen-RM", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-kendali-dokumen-RM", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDaftarKendaliDokumen( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "start", required = false) String start, @@ -3837,24 +2254,23 @@ public class RegistrasiPelayananController extends LocaleController { Map result = registrasiPelayananService.findAllKendaliDokumenRekamMedis(noCm, start, end, ruangan, idStatus); 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 getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllKendaliDokumenRekamMedis", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllKendaliDokumenRekamMedis", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-riwayat-registrasi-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-riwayat-registrasi-pasien", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getRiwayatRegistrasiPasien( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, @@ -3863,102 +2279,43 @@ public class RegistrasiPelayananController extends LocaleController { try { List> result = registrasiPelayananService.riwayatRegistrasiPasien(noCm, noRegistrasi, startDate, endDate); - 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 getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatRegistrasiPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatRegistrasiPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-riwayat-antrian-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-riwayat-antrian-pasien", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRiwayatAntrianPasien( @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, HttpServletRequest request) { try { Map result = registrasiPelayananService.riwayatAntrianPasien(noRegistrasi); - 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 getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatAntrianPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatAntrianPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/update-kelas-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateKelasPelayanan(@Valid @RequestBody RegistrasiPelayananVO vo, - HttpServletRequest request) { - try { - Map result = registrasiPelayananService.updateKelas(vo); - if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try { - BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - } catch (Exception ex) { - ex.getMessage(); - } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-akomodasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveAkomodasi( - @RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar, - HttpServletRequest request) { - try { - Map result = registrasiPelayananService.trigerringSaveAkomodasi(noRecPasienDaftar); - if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save akomodasi", 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 save akomodasi", 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/RehabilitasiAsesmenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java index e61f67c6..07831c69 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RehabilitasiAsesmenService; import com.jasamedika.medifirst2000.service.RehabilitasiKlaimFormulirService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RehabilitasiAsesmenVO; import com.jasamedika.medifirst2000.vo.RehabilitasiFormulirKlaimVO; import org.slf4j.Logger; @@ -56,11 +55,11 @@ public class RehabilitasiAsesmenController extends LocaleController { + + private static final Logger LOGGER = getLogger(RekananController.class); + @Autowired private RekananService rekananService; - - @RequestMapping(value = "/save-rekanan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRekanan(@Valid @RequestBody RekananVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-rekanan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRekanan(@Valid @RequestBody RekananVO vo, HttpServletRequest request, + HttpServletResponse response) { try { Map result = rekananService.saveRekanan(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 Rekanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRekanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Rekanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRekanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/list-rekanan") @ResponseBody - public Map listRekanan( + public Map listRekanan( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "tglRegisterAset") String sort, @RequestParam(value = "dir", required = false, defaultValue = "desc") String dir, @RequestParam(value = "rekananId", required = false) Integer rekananId, @RequestParam(value = "jenisRekananId", required = false) Integer jenisRekananId) { - - Map resultPageMap = rekananService.listRekanan(page, limit, sort, dir, rekananId,jenisRekananId); - - return resultPageMap; + return rekananService.listRekanan(page, limit, sort, dir, rekananId, jenisRekananId); } - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java index 49f7020f..70f6be6e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java @@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.service.StrukHistoriService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.StrukHistoriVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -40,10 +39,10 @@ public class RekapGajiPegawaiController extends LocaleController return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java index 581c3d07..ba223ffb 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java @@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.dto.JadwalSeleksiDto; import com.jasamedika.medifirst2000.dto.TerimaBerkasLamaranDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RekrutmenService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -48,7 +47,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pns-nonpns", method = GET, produces = APPLICATION_JSON_VALUE) @@ -58,7 +57,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/generate-no-planning", method = GET, produces = APPLICATION_JSON_VALUE) @@ -68,7 +67,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-terima-berkas-lamaran", method = POST, produces = APPLICATION_JSON_VALUE) @@ -79,7 +78,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-jenis-test", method = GET, produces = APPLICATION_JSON_VALUE) @@ -89,7 +88,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -99,7 +98,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-petugas-sdm", method = GET, produces = APPLICATION_JSON_VALUE) @@ -109,7 +108,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-jadwal-seleksi", method = POST, produces = APPLICATION_JSON_VALUE) @@ -120,7 +119,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-jadwal-seleksi", method = GET, produces = APPLICATION_JSON_VALUE) @@ -132,7 +131,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pelaksana-pelamar-by-jenis-test-periode", method = GET, produces = APPLICATION_JSON_VALUE) @@ -144,7 +143,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-pelaksana-seleksi", method = POST, produces = APPLICATION_JSON_VALUE) @@ -155,7 +154,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pelaksana-seleksi", method = GET, produces = APPLICATION_JSON_VALUE) @@ -167,7 +166,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-pelaksana-seleksi-by-no-rec-struk-planning", method = GET, produces = APPLICATION_JSON_VALUE) @@ -179,7 +178,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-inputnilai-pelamar-by-jenis-test-periode", method = GET, produces = APPLICATION_JSON_VALUE) @@ -191,7 +190,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-nilai-seleksi", method = POST, produces = APPLICATION_JSON_VALUE) @@ -202,7 +201,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-download-dokumen", method = GET, produces = APPLICATION_JSON_VALUE) @@ -242,7 +241,7 @@ public class RekrutmenController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java index 72658082..7534c531 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.RegistrasiPelamarDto; import com.jasamedika.medifirst2000.service.RekrutmenService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PegawaiVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -39,7 +38,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-agama", method = GET, produces = APPLICATION_JSON_VALUE) @@ -49,7 +48,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-status-perkawinan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -59,7 +58,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-posisi-lamar", method = GET, produces = APPLICATION_JSON_VALUE) @@ -69,7 +68,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-degree", method = GET, produces = APPLICATION_JSON_VALUE) @@ -79,7 +78,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-jenis-organisasi", method = GET, produces = APPLICATION_JSON_VALUE) @@ -89,7 +88,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save-registrasi-pelamar", method = RequestMethod.POST, produces = APPLICATION_JSON_VALUE) @@ -100,7 +99,7 @@ public class RekrutmenOnlineController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java index d3e30f51..4752f067 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RencanaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RencanaCustomVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class RencanaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRencana", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRencana", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java index 9d193888..b38042f5 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.RencanaKinerjaTahunan; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RencanaKinerjaTahunanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RencanaKinerjaOperasionalVO; import com.jasamedika.medifirst2000.vo.RencanaKinerjaTahunanVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; @@ -53,11 +52,11 @@ public class RencanaKinerjaTahunanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when detailReturResep", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when detailReturResep", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java index e32da1f6..3144bb40 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ReturRuanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO; import com.jasamedika.medifirst2000.vo.ReturRuanganVO; import org.slf4j.Logger; @@ -62,17 +61,17 @@ public class ReturRuanganController extends LocaleController getDetailPenerimaanBarang(@RequestParam(value = "noRec") String noRec) { - return returRuanganService.getDetailPenerimaanBarang(noRec); + return returRuanganService.getDetailPenerimaanBarang(noRec); } @RequestMapping(value = "/retur-pengiriman-barang") @@ -87,8 +86,8 @@ public class ReturRuanganController extends LocaleController getDetailRetur(@RequestParam(value = "noRec") String noRec) { - return returRuanganService.getDetailRetur(noRec); + return returRuanganService.getDetailRetur(noRec); } @RequestMapping(value = "/save-verifikasi-pengiriman/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) @@ -120,11 +118,11 @@ public class ReturRuanganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveReturSupplier", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveReturSupplier", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java index ca2bc267..19748b2a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.Risiko; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RisikoService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RisikoVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; @@ -60,11 +59,11 @@ public class RisikoController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when risikoService.save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when risikoService.save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java index 81040b83..8438649b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RisikoKerjaRuanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RisikoKerjaRuanganVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -56,11 +55,11 @@ public class RisikoKerjaRuanganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when ruanganService.add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when ruanganService.add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +65,11 @@ public class RuanganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when ruanganService.update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when ruanganService.update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } return getJsonHttpStatus(NOT_ACCEPTABLE); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java index d451223a..118fbd77 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.DetailSWOT; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DetailSWOTService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.DetailSWOTVO; import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.domain.GreaterThanOrEqual; @@ -73,11 +72,11 @@ public class SWOTController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when totalSkor", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when totalSkor", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -92,11 +91,11 @@ public class SWOTController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDetailFaktor", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDetailFaktor", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java index 6cb4b2a9..67f34c71 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SanitasiKesehatanLingkunganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SanitasiKesehatanLingkunganVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +50,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController> getPjRuangan( - @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { + public ResponseEntity> getPjRuangan(@RequestParam(value = "ruanganId") Integer ruanganId, + HttpServletRequest request) { try { Map result = service.getPjRuangan(ruanganId); if (null != result) { @@ -94,11 +93,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addSatuanStandar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addSatuanStandar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index e0793c70..45879c34 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -10,7 +10,6 @@ import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.*; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -176,11 +175,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveCustomIndexKerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveCustomIndexKerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -207,11 +206,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveBerkasLamaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveBerkasLamaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -240,11 +239,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveReservasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveReservasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -259,11 +258,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when uploadAbsensi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when uploadAbsensi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -278,11 +277,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAbsensiPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAbsensiPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -309,11 +308,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveKedudukan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveKedudukan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -328,11 +327,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveShiftKerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveShiftKerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -347,11 +346,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteShiftKerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deleteShiftKerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -365,11 +364,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when shiftKerjaService.findAll", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when shiftKerjaService.findAll", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -384,11 +383,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAturanPeminjaman", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAturanPeminjaman", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -403,11 +402,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveBibliography", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveBibliography", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -434,11 +433,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDaftarKeanggotaan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDaftarKeanggotaan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -453,11 +452,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveDataKeluarga", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveDataKeluarga", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -472,11 +471,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMutasiPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMutasiPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -491,11 +490,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePerhitunganPremiBPJSKesehatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePerhitunganPremiBPJSKesehatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -511,12 +510,12 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePerhitunganSantunanPegawaiMeninggalDunia", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePerhitunganSantunanPegawaiMeninggalDunia", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -531,11 +530,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePermohonanCutiPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePermohonanCutiPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -550,11 +549,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRegistrasiKeanggotaan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRegistrasiKeanggotaan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -581,11 +580,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRekamDataPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRekamDataPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -600,11 +599,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveIsianPelamar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveIsianPelamar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -630,11 +629,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAsuransiNaker", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAsuransiNaker", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -649,11 +648,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMasterHonorTim", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMasterHonorTim", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -674,11 +673,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveGolongan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveGolongan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -693,11 +692,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveIndekKinerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveIndekKinerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -744,11 +743,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveNilaiKelompokJabatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveNilaiKelompokJabatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -763,11 +762,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMasterEvaluasiJabatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMasterEvaluasiJabatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -783,12 +782,12 @@ public class SdmController extends LocaleController { LOGGER.error("Got ServiceVOException {} when MasterEvaluasiJabatanService.hitungPoinEvaluasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when MasterEvaluasiJabatanService.hitungPoinEvaluasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -803,11 +802,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when EvaluasiJabatanService.hitungPoinEvaluasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when EvaluasiJabatanService.hitungPoinEvaluasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -845,11 +844,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveEvaluasiJabatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveEvaluasiJabatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -902,11 +901,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSimulasiPendapatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSimulasiPendapatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -933,11 +932,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePerhitunganAbk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePerhitunganAbk", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -964,11 +963,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveJadwalOrientasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveJadwalOrientasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1055,11 +1054,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUraianTugas", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUraianTugas", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1134,11 +1133,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveTargetBobotUraianTugas", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveTargetBobotUraianTugas", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1153,11 +1152,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAllIndekKinerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAllIndekKinerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1198,11 +1197,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMonitoring", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMonitoring", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1295,11 +1294,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePenilaianKompetensiPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePenilaianKompetensiPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1316,11 +1315,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when serviceMusare.getUserLogin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when serviceMusare.getUserLogin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1338,11 +1337,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataMuSaReByPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataMuSaReByPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1360,11 +1359,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when loadPagePengajuanMutasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when loadPagePengajuanMutasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1379,11 +1378,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePengajuanMutasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanMutasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1401,11 +1400,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPengajuanMutasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPengajuanMutasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1423,11 +1422,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when loadPagePengajuanSanksi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when loadPagePengajuanSanksi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1442,11 +1441,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePengajuanSanksi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanSanksi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1464,11 +1463,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPengajuanSanksi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPengajuanSanksi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1486,11 +1485,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when loadPagePengajuanResign", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when loadPagePengajuanResign", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1505,11 +1504,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePengajuanResign", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanResign", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1527,11 +1526,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPengajuanResign", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPengajuanResign", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1549,11 +1548,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListDaftarMuSaRe", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListDaftarMuSaRe", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1568,11 +1567,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when ApprovalMusare", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when ApprovalMusare", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1587,11 +1586,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when unVerifMusare", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when unVerifMusare", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1609,11 +1608,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getUserLogin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getUserLogin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1631,11 +1630,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1654,11 +1653,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataCuti", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataCuti", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1676,11 +1675,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataPermohonanStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataPermohonanStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1698,11 +1697,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getApprovalStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getApprovalStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1717,11 +1716,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePlanningPegawaiStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePlanningPegawaiStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1736,11 +1735,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updatePlanningPegawaiStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updatePlanningPegawaiStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1755,11 +1754,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deletePlanningPegawaiStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when deletePlanningPegawaiStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1774,11 +1773,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when approvalPermohonanStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when approvalPermohonanStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1793,11 +1792,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when unVerifPermohonanStatus", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when unVerifPermohonanStatus", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1814,11 +1813,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPeriodeGolongan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPeriodeGolongan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1836,11 +1835,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDaftarGajiPns", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDaftarGajiPns", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1859,11 +1858,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDtailGajiPns", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDtailGajiPns", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1904,11 +1903,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRekapKomponen", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRekapKomponen", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1923,11 +1922,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveTotalIndexRekapitulasiKehadiran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveTotalIndexRekapitulasiKehadiran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1942,11 +1941,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveFactorRate", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveFactorRate", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2049,11 +2048,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveLemburVerifikasiSdm", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveLemburVerifikasiSdm", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2067,11 +2066,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findPegawaiAktifAndVerifiedByUnitKerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findPegawaiAktifAndVerifiedByUnitKerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2084,11 +2083,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getRunningNumberStrukHistori", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getRunningNumberStrukHistori", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2102,11 +2101,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findJumlahLembur", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findJumlahLembur", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2121,11 +2120,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUangLembur", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUangLembur", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2153,11 +2152,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when penangguhanPerubahanStatusKehadiran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when penangguhanPerubahanStatusKehadiran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2172,11 +2171,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when setJatahCuti", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when setJatahCuti", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2191,11 +2190,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when setJatahCutiPegawai", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when setJatahCutiPegawai", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2210,11 +2209,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMappingPegawaiToAtasan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMappingPegawaiToAtasan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2264,11 +2263,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRincianKegiatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRincianKegiatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2283,11 +2282,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUraianTugasNew", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUraianTugasNew", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2336,11 +2335,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUnitkerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUnitkerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2378,11 +2377,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAbsenManual", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAbsenManual", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2397,11 +2396,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSubUnitkerja", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSubUnitkerja", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2476,11 +2475,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveKelompokJabatan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveKelompokJabatan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2539,11 +2538,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveMapKalenderToHariLibur", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveMapKalenderToHariLibur", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2593,11 +2592,11 @@ public class SdmController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add saveUraianTugasFlexible", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add saveUraianTugasFlexible", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SettingDataFixedController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SettingDataFixedController.java index bb4b6b99..3070e6e0 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SettingDataFixedController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SettingDataFixedController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SettingDataFixedService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SettingDataFixedVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +47,7 @@ public class SettingDataFixedController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSewaAsrama", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSewaAsrama", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -68,11 +67,11 @@ public class SewaAsramaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findStatusKamar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findStatusKamar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -86,11 +85,11 @@ public class SewaAsramaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findKamar", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findKamar", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java index 80b12869..016f0c42 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dto.SewaLahanDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SewaLahanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SewaLahanVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +49,11 @@ public class SewaLahanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSewaLahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSewaLahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -67,11 +66,11 @@ public class SewaLahanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findProdukSewaLahan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findProdukSewaLahan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java index d2a494a9..59ebe089 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SignInOperationService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SignInOperationVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -54,11 +53,11 @@ public class SignInOperationController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonHttpStatus(ACCEPTED, mapHeaderMessage); + return getJsonHttpStatus(ACCEPTED, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addSoap", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addSoap", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java index d0353480..8b0a29d1 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SppbService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SppbVO; import com.jasamedika.medifirst2000.vo.VerifikasiSppbVO; import org.slf4j.Logger; @@ -84,11 +83,11 @@ public class SppbController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveSppb", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveSppb", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -103,11 +102,11 @@ public class SppbController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when verifikasiSppb", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when verifikasiSppb", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -122,11 +121,11 @@ public class SppbController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when unverifikasiSppb", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when unverifikasiSppb", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -141,11 +140,11 @@ public class SppbController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateSppb", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateSppb", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java index 91a95f77..3576caa1 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java @@ -2,55 +2,53 @@ package com.jasamedika.medifirst2000.controller; 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.StandarPelayananMakananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.StandarPelayananMakananVO; 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 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("/standar-pelayanan-makanan") -public class StandarPelayananMakananController extends LocaleController { +public class StandarPelayananMakananController extends LocaleController { + @Autowired private StandarPelayananMakananService standarPelayananMakananService; - - @RequestMapping(value="/save/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveData( - @RequestBody List dtos, + + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> saveData(@RequestBody List vos, HttpServletRequest request) { - List> result = this.standarPelayananMakananService.save(dtos); + List> result = this.standarPelayananMakananService.save(vos); 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-all/", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-all/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getDataAll(HttpServletRequest request) { - Map result = this.standarPelayananMakananService.getStandarPelayananMakanan(); - return result; + return this.standarPelayananMakananService.getStandarPelayananMakanan(); } - - @RequestMapping(value="/get-ruangan/", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-ruangan/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getRuangan(HttpServletRequest request) { - Map result = this.standarPelayananMakananService.getRuangan(); - return result; + return this.standarPelayananMakananService.getRuangan(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java index e44eb32d..9c111eba 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.StokOpNameService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.StokOpNameVO; import com.jasamedika.medifirst2000.vo.StrukClosingVO; import org.slf4j.Logger; @@ -56,11 +55,11 @@ public class StokOpNameController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveStokOpName", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveStokOpName", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java index 2d451590..12f50de2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.StrukBuktiPengeluaranService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.StrukPengeluaranVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -41,7 +40,7 @@ public class StrukBuktiPengeluaranController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when kirimProdukKeRuangan", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when kirimProdukKeRuangan", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -81,11 +80,11 @@ public class StrukPelayananController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveInputKantongDarah", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveInputKantongDarah", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -100,11 +99,11 @@ public class StrukPelayananController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveLimbahB3Masuk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveLimbahB3Masuk", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -119,11 +118,11 @@ public class StrukPelayananController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when updateLimbahB3Masuk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when updateLimbahB3Masuk", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -138,11 +137,11 @@ public class StrukPelayananController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when deleteLimbahB3Masuk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException | IllegalAccessException e) { LOGGER.error("Got exception {} when deleteLimbahB3Masuk", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -174,11 +173,11 @@ public class StrukPelayananController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when returPelayananPasien", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when returPelayananPasien", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java index c6a6db98..dc7426cd 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SuratService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SuratVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -44,11 +43,11 @@ public class SuratController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllSurat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllSurat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java index 4b9d74eb..badee1fe 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.entities.DokumenTemplate; import com.jasamedika.medifirst2000.service.SuratMasukService; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; @@ -52,7 +51,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -140,7 +139,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -184,7 +183,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -204,7 +203,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -223,7 +222,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -259,7 +258,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -271,7 +270,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -284,7 +283,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -339,7 +338,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -352,7 +351,7 @@ public class SuratMasukController extends LocaleController { return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java index a030acba..1efbdb9b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java @@ -1,42 +1,40 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.ArrayList; -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.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.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.dao.ResultSurveiDetailDao; import com.jasamedika.medifirst2000.dao.SurveiDao; import com.jasamedika.medifirst2000.dao.SurveiDetailDao; +import com.jasamedika.medifirst2000.entities.ResultSurveiDetail; import com.jasamedika.medifirst2000.entities.Survei; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SurveiService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ResultSurveiVO; -//import com.jasamedika.medifirst2000.vo.UploadVO; +import com.jasamedika.medifirst2000.vo.SurveiVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.util.JsonUtil.ToMaps; +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 Registrasi Pasien Business @@ -44,208 +42,100 @@ import com.jasamedika.medifirst2000.vo.ResultSurveiVO; */ @RestController @RequestMapping("/survei") -public class SurveiController extends LocaleController -implements IBaseRestController { +public class SurveiController extends LocaleController { + + private static final Logger LOGGER = getLogger(SurveiController.class); @Autowired - private SurveiService surveiService; - private static final Logger LOGGER = LoggerFactory.getLogger(SurveiController.class); + private SurveiService surveiService; - @RequestMapping(value = "/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity savePapInformasiIbu(@Valid @RequestBody List vo,HttpServletRequest request) throws ParseException { - try { - return RestUtil.getJsonResponse(surveiService.Save(vo), HttpStatus.CREATED,mapHeaderMessage); -// Map result=papInformasiIbuService.savePapInformasiIbu(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } @Autowired private SurveiDao surveiDao; - + @Autowired private SurveiDetailDao surveiDetailDao; - + @Autowired private ResultSurveiDetailDao resultSurveiDetailDao; - - @RequestMapping(value = "/get-survei", method = RequestMethod.GET) - public ResponseEntity> getOrderFromSirs( - @RequestParam(value = "group", required = false - ) String group, - - HttpServletRequest request) throws ParseException { + + @RequestMapping(value = "/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePapInformasiIbu(@Valid @RequestBody List vo, + HttpServletRequest request) { try { - Map hasil = new HashMap<>(); - List> list = new ArrayList<>(); + Map result = surveiService.Save(vo); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when surveiService.Save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when surveiService.Save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/get-survei", method = GET) + public ResponseEntity> getOrderFromSirs( + @RequestParam(value = "group", required = false) String group, HttpServletRequest request) { + try { + Map hasil = new HashMap<>(); + List> list = new ArrayList<>(); for (Survei data : surveiDao.findByKelompok(group)) { - Map temp; - try { - temp = data.ToMap(); - - - temp.put("detail",JsonUtil.ToMaps(surveiDetailDao.findBySurveiId(data.getId()))); - - - - list.add(temp); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - + Map temp = data.ToMap(); + temp.put("detail", ToMaps(surveiDetailDao.findBySurveiId(data.getId()))); + list.add(temp); } hasil.put("items", list); - return RestUtil.getJsonResponse(hasil, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(hasil, 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); - } 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 ServiceVOException {} when findBySurveiId", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException | IllegalArgumentException | IllegalAccessException jse) { + LOGGER.error("Got JpaSystemException {} when findBySurveiId", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-rekap-survei", method = RequestMethod.GET) + @RequestMapping(value = "/get-rekap-survei", method = GET) public ResponseEntity> getRekapOrderFromSirs( - @RequestParam(value = "group", required = false - ) String group, - @RequestParam(value = "groupId", required = false) Integer groupId, - - HttpServletRequest request) throws ParseException { - try { - Map hasil = new HashMap<>(); - List> list = new ArrayList<>(); - - Map temp= new HashMap(); - try { - - Boolean valid =false; - - temp.put("detail",JsonUtil.ToMaps(resultSurveiDetailDao.findBySurveiDetailSurveiId(Integer.parseInt(group)))); - valid=true; - - if(valid==true) - list.add(temp); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - - - hasil.put("items", list); - return RestUtil.getJsonResponse(temp, HttpStatus.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); - } 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); - } - - } - - @RequestMapping(value = "/get-rekap-survei-kuisioner", method = RequestMethod.GET) - public ResponseEntity> getRekapSurveiKuisioner( - @RequestParam(value = "group", required = false - ) String group, - @RequestParam(value = "groupId", required = false) Integer groupId, - - HttpServletRequest request) throws ParseException { - try { - Map hasil = new HashMap<>(); - List> list = new ArrayList<>(); - - Map temp= new HashMap(); - try { - - Boolean valid =false; - - temp.put("detail",JsonUtil.ToMaps(resultSurveiDetailDao.findBySurveiDetailSurveiId())); - valid=true; - - if(valid==true) - list.add(temp); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - - - hasil.put("items", list); - return RestUtil.getJsonResponse(temp, HttpStatus.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); - } 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); - } - - } - - @RequestMapping(value = "/get-rekap", method = RequestMethod.GET) - public ResponseEntity> getOrderFromSirs( - @RequestParam(value = "dateStart", required = false) String dateStart, - @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "group", required = false) String group, - HttpServletRequest request) throws ParseException { + @RequestParam(value = "groupId", required = false) Integer groupId, HttpServletRequest request) { try { - Map hasil = new HashMap<>(); - Map list=surveiService.getRekap(DateUtil.toDate(dateStart),DateUtil.toDate(dateEnd),group); - hasil.put("result", list); - return RestUtil.getJsonResponse(hasil, HttpStatus.OK, mapHeaderMessage); + Map temp = new HashMap<>(); + List detail = resultSurveiDetailDao.findBySurveiDetailSurveiId(Integer.parseInt(group)); + temp.put("detail", ToMaps(detail)); + return getJsonResponse(temp, 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); - } 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 ServiceVOException {} when findBySurveiDetailSurveiId", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException | IllegalArgumentException | IllegalAccessException jse) { + LOGGER.error("Got JpaSystemException {} when findBySurveiDetailSurveiId", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } + } + @RequestMapping(value = "/get-rekap-survei-kuisioner", method = GET) + public ResponseEntity> getRekapSurveiKuisioner( + @RequestParam(value = "group", required = false) String group, + @RequestParam(value = "groupId", required = false) Integer groupId, HttpServletRequest request) { + try { + Map temp = new HashMap<>(); + temp.put("detail", ToMaps(resultSurveiDetailDao.findBySurveiDetailSurveiId())); + return getJsonResponse(temp, OK, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when findBySurveiDetailSurveiId--kuisioner", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException | IllegalArgumentException | IllegalAccessException jse) { + LOGGER.error("Got JpaSystemException {} when findBySurveiDetailSurveiId--kuisioner", 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(ResultSurveiVO vo) { - return null; - } - @Override - public ResponseEntity editVO(ResultSurveiVO 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/SwabAlatPermukaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java index 139fc4a5..53d68f35 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SwabAlatPermukaanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.SwabAlatPermukaanVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +50,11 @@ public class SwabAlatPermukaanController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when detailTOWSService.save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when detailTOWSService.save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java index 87b58a6a..5fc1fe62 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.TagihanRekananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.StrukBuktiPengeluaranCaraBayarVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class TagihanRekananController extends LocaleController mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/save", method = POST, produces = APPLICATION_JSON_VALUE) @@ -48,7 +47,7 @@ public class TahapanRekrutmenTestController extends LocaleController mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, CREATED, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java index c82200fe..13bb5796 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.TargetIndikatorService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.TargetIndikatorVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -48,11 +47,11 @@ public class TargetIndikatorController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addTidurIstirahat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addTidurIstirahat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java index 3c37ff24..9a4f51af 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.TimeOutControlService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.TimeOutControlVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class TimeOutControlController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveTimeOutControl", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveTimeOutControl", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -71,11 +70,11 @@ public class TimeOutControlController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findByNoRec", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findByNoRec", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -93,11 +92,11 @@ public class TimeOutControlController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getTimeOutByNoRecAntrian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getTimeOutByNoRecAntrian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java index 31fcdf74..f5a771a6 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.TingkatResikoService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.TingkatResikoVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -47,11 +46,11 @@ public class TingkatResikoController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when tingkatResikoService.save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when tingkatResikoService.save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java index 7d7c628a..a667edd2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.TorService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.TorVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -45,11 +44,11 @@ public class TorController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when torService.add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when torService.add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java index 27167da5..baa25954 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java @@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.*; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -71,11 +70,11 @@ public class TransferPasienInternalController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveHasilTriaseService", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveHasilTriaseService", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java index 2a863974..ceb5eacf 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java @@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.UploadDownloadImageService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.UploadImageVO; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -49,11 +48,11 @@ public class UploadDownloadmageController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUsulanEvaluasiDanKahianOrganisasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUsulanEvaluasiDanKahianOrganisasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -74,11 +73,11 @@ public class UsulanEvaluasiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when noUsulanDanKajianOrganisasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when noUsulanDanKajianOrganisasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -95,11 +94,11 @@ public class UsulanEvaluasiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when listUsulanEvaluasiByRuanganPembuat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when listUsulanEvaluasiByRuanganPembuat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -121,11 +120,11 @@ public class UsulanEvaluasiController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveRekomendasiUsulanEvaluasi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveRekomendasiUsulanEvaluasi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/IBaseRestController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/IBaseRestController.java deleted file mode 100644 index 15002a00..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/IBaseRestController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static org.springframework.web.bind.annotation.RequestMethod.*; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface IBaseRestController extends IRestPageController { - - @RequestMapping(value = "/{id}", method = GET) - @ResponseBody - ResponseEntity getVO(@PathVariable("id") Integer id); - - @RequestMapping(value = "/", method = POST, consumes = { "application/json" }) - @ResponseBody - ResponseEntity addVO(@RequestBody V vo); - - @RequestMapping(value = "/", method = PUT, consumes = { "application/json" }) - @ResponseBody - ResponseEntity editVO(@RequestBody V vo); - - @RequestMapping(value = "/{id}", method = DELETE) - @ResponseBody - ResponseEntity deleteVO(@PathVariable("id") Integer id); - - @RequestMapping(value = "/", method = GET) - @ResponseBody - ResponseEntity> getAllVO(); - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/IRestPageController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/IRestPageController.java deleted file mode 100644 index 2ab5c19c..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/IRestPageController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletRequest; -import java.util.Collection; - -import static org.springframework.web.bind.annotation.RequestMethod.GET; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface IRestPageController { - - /** - * - * @param page - * : page of - * @param limit - * : limit query - * @param sort - * : sort by - * @param dir - * : direction {asc:desc} - * @return Collection of VO, Total-Count & Total Pages on response header - */ - @RequestMapping(value = "/list", method = GET) - @ResponseBody - ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir); - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java index 17179962..1c6da857 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java @@ -4,15 +4,12 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializer; import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.ActivityPegawaiService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.ModelService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.ModelVO; import com.jasamedika.medifirst2000.vo.PegawaiVO; import io.socket.client.IO; @@ -21,7 +18,6 @@ import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,6 +32,12 @@ import java.net.URISyntaxException; import java.util.*; import static com.jasamedika.medifirst2000.constants.Constants.Locale.INA; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER; +import static com.jasamedika.medifirst2000.core.web.WebConstants.PageParameter.*; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.BAD_REQUEST; 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; @@ -157,7 +159,7 @@ public abstract class LocaleController { @RequestMapping(value = "/entity-serelize/{entity}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity serializeEntity(@PathVariable("entity") String entity, HttpServletRequest request) { ModelVO modelDTO = modelService.getModelSerializeEntity(entity, getCoociesLanguage(request)); - return RestUtil.getJsonResponse(modelDTO, OK); + return getJsonResponse(modelDTO, OK); } public String getCoociesLanguage(HttpServletRequest request) { @@ -177,18 +179,16 @@ public abstract class LocaleController { protected ResponseEntity> constructListPageResult(Map map) { if (map == null) { Map mapHeaderMessage = new HashMap<>(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, "0"); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, "0"); - mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Data not found."); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, mapHeaderMessage); + mapHeaderMessage.put(TOTAL_PAGE_HEADER, "0"); + mapHeaderMessage.put(TOTAL_COUNT_HEADER, "0"); + mapHeaderMessage.put(ERROR_MESSAGE, "Data not found."); + return getJsonResponse(null, BAD_REQUEST, mapHeaderMessage); } else { - Collection vos = (Collection) map.get(WebConstants.PageParameter.LIST_DATA); + Collection vos = (Collection) map.get(LIST_DATA); Map mapHeaderMessage = new HashMap<>(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, - String.valueOf(map.get(WebConstants.PageParameter.TOTAL_PAGES))); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, - String.valueOf(map.get(WebConstants.PageParameter.TOTAL_ELEMENTS))); - return RestUtil.getJsonResponse(vos, OK, mapHeaderMessage); + mapHeaderMessage.put(TOTAL_PAGE_HEADER, String.valueOf(map.get(TOTAL_PAGES))); + mapHeaderMessage.put(TOTAL_COUNT_HEADER, String.valueOf(map.get(TOTAL_ELEMENTS))); + return getJsonResponse(vos, OK, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java index f97c32b9..e53759ec 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java @@ -1,20 +1,21 @@ package com.jasamedika.medifirst2000.controller.base; import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.monitorjbl.json.JsonResult; import com.monitorjbl.json.JsonView; import com.monitorjbl.json.Match; import org.springframework.core.GenericTypeResolver; -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 java.util.List; +import static com.jasamedika.medifirst2000.constants.Constants.COMMA; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.web.bind.annotation.RequestMethod.GET; + /** * Base Controller Class for handling "include" parameter to controller * @@ -26,16 +27,16 @@ public abstract class ParamRestController { private final JsonResult jsonResult = JsonResult.instance(); - @RequestMapping(value = "/list-using-param", method = RequestMethod.GET) + @RequestMapping(value = "/list-using-param", method = GET) public ResponseEntity> listUsingParam(@RequestParam(value = "includes", required = false) String includes, @RequestParam(value = "excludes", required = false) String excludes) { List listVO = getAllVOFromService(); String[] arrExcludes = null; String[] arrIncludes = null; if (excludes != null) - arrExcludes = excludes.split(Constants.COMMA); + arrExcludes = excludes.split(COMMA); if (includes != null) - arrIncludes = includes.split(Constants.COMMA); + arrIncludes = includes.split(COMMA); if (arrExcludes != null && arrIncludes != null) { listVO = jsonResult.use( JsonView.with(listVO).onClass(getClazz(), Match.match().exclude(arrExcludes).include(arrIncludes))) @@ -51,10 +52,9 @@ public abstract class ParamRestController { .use(JsonView.with(listVO).onClass(getClazz(), Match.match().exclude("*").include(arrIncludes))) .returnValue(); } - return RestUtil.getJsonResponse(listVO, HttpStatus.OK); + return RestUtil.getJsonResponse(listVO, OK); } - @SuppressWarnings("unchecked") protected Class getClazz() { return (Class) GenericTypeResolver.resolveTypeArgument(getClass(), ParamRestController.class); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java index 9ffb4eed..dc86f197 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java @@ -1,11 +1,9 @@ package com.jasamedika.medifirst2000.filter; -import com.jasamedika.medifirst2000.constants.Constants; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.servlet.*; @@ -15,6 +13,10 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.Iterator; +import static com.jasamedika.medifirst2000.constants.Constants.HttpHeader.KD_RUANGAN_A; +import static com.jasamedika.medifirst2000.constants.Constants.HttpHeader.KD_RUANGAN_T; +import static org.slf4j.LoggerFactory.getLogger; + /** * CORSFilter class * @@ -23,7 +25,7 @@ import java.util.Iterator; @Component public class CORSFilter implements Filter { - private static final Logger LOGGER = LoggerFactory.getLogger(CORSFilter.class); + private static final Logger LOGGER = getLogger(CORSFilter.class); public CORSFilter() { LOGGER.info("CORSFilter JasaMedika Web init"); @@ -37,8 +39,7 @@ public class CORSFilter implements Filter { HttpServletRequest request = (HttpServletRequest) req; StringBuilder stringBuilder = getStringBuilder(request); body = stringBuilder.toString(); - String idRuanganTujuan = request.getHeader(Constants.HttpHeader.KD_RUANGAN_T) == null ? "" - : request.getHeader(Constants.HttpHeader.KD_RUANGAN_T); + String idRuanganTujuan = request.getHeader(KD_RUANGAN_T) == null ? "" : request.getHeader(KD_RUANGAN_T); if (idRuanganTujuan.trim().isEmpty()) { JSONObject jObject; try { @@ -55,7 +56,7 @@ public class CORSFilter implements Filter { } public String getHeader(String key) { - if (key.equals(Constants.HttpHeader.KD_RUANGAN_A)) { + if (key.equals(KD_RUANGAN_A)) { if (autoIdTujuan.length() > 0) { return autoIdTujuan.toString(); } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java index 08a70edf..8d36431f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java @@ -1,7 +1,6 @@ package com.jasamedika.medifirst2000.filter; import com.fasterxml.jackson.core.JsonParseException; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; import io.jsonwebtoken.MalformedJwtException; import org.springframework.security.core.Authentication; @@ -16,6 +15,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; + /** * StatelessAuthenticationFilter class * @@ -47,7 +48,7 @@ public class StatelessAuthenticationFilter extends GenericFilterBean { authentication = authenticationService.getAuthentication(httpRequest); } catch (JsonParseException | MalformedJwtException e) { HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.addHeader(Constants.MessageInfo.ERROR_MESSAGE, "Error Token (Not Valid Token)"); + httpResponse.addHeader(ERROR_MESSAGE, "Error Token (Not Valid Token)"); filterChain.doFilter(request, response); } SecurityContextHolder.getContext().setAuthentication(authentication); diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java index ed914baf..f18dc012 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java @@ -1,14 +1,11 @@ package com.jasamedika.medifirst2000.handler; import com.jasamedika.medifirst2000.base.vo.validation.ValidationErrorVO; -import com.jasamedika.medifirst2000.constants.Constants; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.annotation.Order; -import org.springframework.http.HttpStatus; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -20,6 +17,10 @@ import org.springframework.web.bind.annotation.ResponseStatus; import java.util.List; import java.util.Locale; +import static com.jasamedika.medifirst2000.constants.Constants.Locale.INA; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.BAD_REQUEST; + /** * Exception Handler Rest Controller class * @@ -30,7 +31,7 @@ import java.util.Locale; @Order(1) public class RestErrorHandler { - private static final Logger LOGGER = LoggerFactory.getLogger(RestErrorHandler.class); + private static final Logger LOGGER = getLogger(RestErrorHandler.class); private final MessageSource messageSource; @@ -40,10 +41,11 @@ public class RestErrorHandler { } @ExceptionHandler(MethodArgumentNotValidException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) + @ResponseStatus(BAD_REQUEST) @ResponseBody public ValidationErrorVO processValidationError(MethodArgumentNotValidException ex) { LOGGER.warn("Handling data validation error"); + BindingResult result = ex.getBindingResult(); List fieldErrors = result.getFieldErrors(); return processFieldErrors(fieldErrors); @@ -52,13 +54,13 @@ public class RestErrorHandler { private ValidationErrorVO processFieldErrors(List fieldErrors) { ValidationErrorVO dto = new ValidationErrorVO(); for (FieldError fieldError : fieldErrors) { - String localizedErrorMessage = resolveLocalizedErrorMessage(fieldError); + String localizedErrorMessage = resolveIndonesianErrorMessage(fieldError); dto.addFieldError(fieldError.getField(), localizedErrorMessage); } return dto; } - private String resolveLocalizedErrorMessage(FieldError fieldError, String locale) { + private String resolveCurrentLocalErrorMessage(FieldError fieldError) { Locale currentLocale = LocaleContextHolder.getLocale(); String localizedErrorMessage = messageSource.getMessage(fieldError, currentLocale); if (localizedErrorMessage.equals(fieldError.getDefaultMessage())) { @@ -68,8 +70,8 @@ public class RestErrorHandler { return localizedErrorMessage; } - private String resolveLocalizedErrorMessage(FieldError fieldError) { - String localizedErrorMessage = messageSource.getMessage(fieldError, new Locale(Constants.Locale.INA)); + private String resolveIndonesianErrorMessage(FieldError fieldError) { + String localizedErrorMessage = messageSource.getMessage(fieldError, new Locale(INA)); if (localizedErrorMessage.equals(fieldError.getDefaultMessage())) { String[] fieldErrorCodes = fieldError.getCodes(); localizedErrorMessage = fieldErrorCodes[0]; diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index 2b405e5f..a84d2110 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -1,6 +1,5 @@ package com.jasamedika.medifirst2000.interceptor; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.dao.LoginUserDao; import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.entities.*; @@ -8,7 +7,6 @@ import com.jasamedika.medifirst2000.notification.MessagePublisher; import com.jasamedika.medifirst2000.security.model.AppPermission; import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; import com.jasamedika.medifirst2000.service.*; -import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.NotifMessagingSchedulerVO; import com.jasamedika.medifirst2000.vo.NotifMessagingVO; import com.jasamedika.medifirst2000.vo.NotifikasiMessageObjekModulVO; @@ -29,6 +27,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import static com.jasamedika.medifirst2000.constants.Constants.HttpHeader.*; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.INFO_MESSAGE; +import static com.jasamedika.medifirst2000.util.CommonUtil.isNotNullOrEmpty; +import static com.jasamedika.medifirst2000.util.CommonUtil.isNullOrEmpty; +import static javax.servlet.http.HttpServletResponse.*; + /** * Interceptor class for All annotation method controller @AppPermission * @@ -80,7 +85,7 @@ public class AppInterceptor implements HandlerInterceptor { String namaUser; private boolean contains(String source, String[] matchers) { - if (CommonUtil.isNullOrEmpty(source) || ArrayUtils.isEmpty(matchers)) + if (isNullOrEmpty(source) || ArrayUtils.isEmpty(matchers)) return false; for (String matcher : matchers) if (source.contains(matcher)) @@ -100,10 +105,10 @@ public class AppInterceptor implements HandlerInterceptor { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); - if (CommonUtil.isNullOrEmpty(loginUser)) { + if (isNullOrEmpty(loginUser)) { response.setHeader("RequireSupervisor", "false"); - response.setHeader(Constants.MessageInfo.ERROR_MESSAGE, "Empty login user"); - response.setStatus(HttpServletResponse.SC_FORBIDDEN); + response.setHeader(ERROR_MESSAGE, "Empty login user"); + response.setStatus(SC_FORBIDDEN); return false; } return true; @@ -173,19 +178,19 @@ public class AppInterceptor implements HandlerInterceptor { int action) throws Exception { List objekModulAplikasi = objekModulAplikasiService .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); - if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) + if (isNullOrEmpty(objekModulAplikasi)) return true; if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { response.setHeader("RequireSupervisor", "true"); - response.setHeader(Constants.MessageInfo.ERROR_MESSAGE, "Action requires supervisor"); - response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.setHeader(ERROR_MESSAGE, "Action requires supervisor"); + response.setStatus(SC_UNAUTHORIZED); return false; } else if (resultUser == 1) { - response.setHeader(Constants.MessageInfo.INFO_MESSAGE, "Supervise execution success"); - response.setStatus(HttpServletResponse.SC_OK); + response.setHeader(INFO_MESSAGE, "Supervise execution success"); + response.setStatus(SC_OK); return true; } int resultKelompokUser = checkKelompokUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); @@ -195,12 +200,12 @@ public class AppInterceptor implements HandlerInterceptor { return true; } else if (resultKelompokUser == 0) { response.setHeader("RequireSupervisor", "true"); - response.setHeader(Constants.MessageInfo.ERROR_MESSAGE, "Action requires supervisor"); - response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.setHeader(ERROR_MESSAGE, "Action requires supervisor"); + response.setStatus(SC_UNAUTHORIZED); return false; } else { - response.setHeader(Constants.MessageInfo.INFO_MESSAGE, "Supervise execution success"); - response.setStatus(HttpServletResponse.SC_OK); + response.setHeader(INFO_MESSAGE, "Supervise execution success"); + response.setStatus(SC_OK); return true; } } @@ -209,16 +214,14 @@ public class AppInterceptor implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { HandlerMethod hm; Method method; - response.setHeader("Access-Control-Expose-Headers", "RequireSupervisor" + "," - + Constants.MessageInfo.ERROR_MESSAGE + "," + Constants.MessageInfo.INFO_MESSAGE); - String AlamatUrlForm = request.getHeader(Constants.HttpHeader.URL_FORM) == null ? "" - : request.getHeader(Constants.HttpHeader.URL_FORM); - String KdRuangan = request.getHeader(Constants.HttpHeader.KD_RUANGAN) == null ? "" - : request.getHeader(Constants.HttpHeader.KD_RUANGAN); + response.setHeader("Access-Control-Expose-Headers", + "RequireSupervisor" + "," + ERROR_MESSAGE + "," + INFO_MESSAGE); + String AlamatUrlForm = request.getHeader(URL_FORM) == null ? "" : request.getHeader(URL_FORM); + String KdRuangan = request.getHeader(KD_RUANGAN) == null ? "" : request.getHeader(KD_RUANGAN); int action = AppPermission.VIEW; - if (CommonUtil.isNullOrEmpty(AlamatUrlForm)) + if (isNullOrEmpty(AlamatUrlForm)) return true; - if (CommonUtil.isNullOrEmpty(KdRuangan) || "0".equals(KdRuangan)) + if (isNullOrEmpty(KdRuangan) || "0".equals(KdRuangan)) return true; String URI = request.getRequestURI(); String methodHttp = request.getMethod(); @@ -264,9 +267,9 @@ public class AppInterceptor implements HandlerInterceptor { return checkPermission(request, response, AlamatUrlForm, action); } } catch (Exception e) { - response.setHeader(Constants.MessageInfo.ERROR_MESSAGE, "Something wrong happened"); + response.setHeader(ERROR_MESSAGE, "Something wrong happened"); response.setHeader("RequireSupervisor", "false"); - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + response.setStatus(SC_INTERNAL_SERVER_ERROR); return false; } return true; @@ -279,46 +282,41 @@ public class AppInterceptor implements HandlerInterceptor { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object obj, Exception ex) throws Exception { - String AlamatUrlForm = request.getHeader(Constants.HttpHeader.URL_FORM) == null ? "" - : request.getHeader(Constants.HttpHeader.URL_FORM); - String KdRuangan = request.getHeader(Constants.HttpHeader.KD_RUANGAN) == null ? "" - : request.getHeader(Constants.HttpHeader.KD_RUANGAN); - String idRuanganTujuan = request.getHeader(Constants.HttpHeader.KD_RUANGAN_T) == null ? "" - : request.getHeader(Constants.HttpHeader.KD_RUANGAN_T); - String idRuanganTujuanA = request.getHeader(Constants.HttpHeader.KD_RUANGAN_A) == null ? "" - : request.getHeader(Constants.HttpHeader.KD_RUANGAN_A); - String tglKirim = request.getHeader(Constants.HttpHeader.TGL_KIRIM) == null ? "" - : request.getHeader(Constants.HttpHeader.TGL_KIRIM); - boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; - boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); + String AlamatUrlForm = request.getHeader(URL_FORM) == null ? "" : request.getHeader(URL_FORM); + String KdRuangan = request.getHeader(KD_RUANGAN) == null ? "" : request.getHeader(KD_RUANGAN); + String idRuanganTujuan = request.getHeader(KD_RUANGAN_T) == null ? "" : request.getHeader(KD_RUANGAN_T); + String idRuanganTujuanA = request.getHeader(KD_RUANGAN_A) == null ? "" : request.getHeader(KD_RUANGAN_A); + String tglKirim = request.getHeader(TGL_KIRIM) == null ? "" : request.getHeader(TGL_KIRIM); + boolean notHttpOK = response.getStatus() >= SC_BAD_REQUEST; + boolean notLewatMenu = isNullOrEmpty(AlamatUrlForm) || isNullOrEmpty(KdRuangan); Integer ruanganAsalId; try { ruanganAsalId = Integer.parseInt(KdRuangan); } catch (NumberFormatException e) { ruanganAsalId = 0; } - boolean adaError = CommonUtil.isNotNullOrEmpty(ex); + boolean adaError = isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; Authentication authentication = tokenAuthenticationService.getAuthentication(request); - if (CommonUtil.isNullOrEmpty(authentication)) + if (isNullOrEmpty(authentication)) return; namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); - if (CommonUtil.isNullOrEmpty(loginUser)) + if (isNullOrEmpty(loginUser)) return; String potongan = filterUrlForm(AlamatUrlForm); List objekModulAplikasiVOs = objekModulAplikasiService.findByAlamatUrlForm(potongan); - if (CommonUtil.isNullOrEmpty(objekModulAplikasiVOs)) + if (isNullOrEmpty(objekModulAplikasiVOs)) return; String URI = request.getRequestURI(); Integer objekModulAplikasId = objekModulAplikasiVOs.get(0).getId(); List notifMessagingVOs = notifMessagingService .findByObjekModulAplikasiIdAndUrlBackEndOrUrlBackEndIsNull(objekModulAplikasId, URI); - if (CommonUtil.isNullOrEmpty(notifMessagingVOs)) + if (isNullOrEmpty(notifMessagingVOs)) return; Integer notifMessagingId = notifMessagingVOs.get(0).getId(); - if (CommonUtil.isNullOrEmpty(tglKirim)) { + if (isNullOrEmpty(tglKirim)) { List ruanganTujuansId = new ArrayList<>(); if (!"".equals(idRuanganTujuan)) { JSONArray ruanganTujuanIds = new JSONArray(idRuanganTujuan); diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java index 451f4ce8..e159da5b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java @@ -1,8 +1,6 @@ package com.jasamedika.medifirst2000.security; -import com.jasamedika.medifirst2000.constants.Constants; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; @@ -12,6 +10,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static org.apache.commons.httpclient.HttpStatus.SC_FORBIDDEN; +import static org.slf4j.LoggerFactory.getLogger; + /** * RestAuthenticationEntryPoint class set Unauthorized response from * "Unauthorized client" @@ -21,15 +23,16 @@ import java.io.IOException; @Component("RestAuthenticationEntryPoint") public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint { - private static final Logger LOGGER = LoggerFactory.getLogger(RestAuthenticationEntryPoint.class); + private static final Logger LOGGER = getLogger(RestAuthenticationEntryPoint.class); @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException ae) throws IOException, ServletException { LOGGER.error("Mencoba akses tanpa login"); - response.getWriter().write("{" + Constants.MessageInfo.ERROR_MESSAGE + ":'Please login to get access'}"); - response.setHeader(Constants.MessageInfo.ERROR_MESSAGE, "Please login to get access"); - response.setStatus(HttpServletResponse.SC_FORBIDDEN); + + response.getWriter().write("{" + ERROR_MESSAGE + ":'Please login to get access'}"); + response.setHeader(ERROR_MESSAGE, "Please login to get access"); + response.setStatus(SC_FORBIDDEN); } } \ No newline at end of file diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java index 923cd74a..b2a7ab59 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java @@ -1,5 +1,8 @@ package com.jasamedika.medifirst2000.security; +import com.jasamedika.medifirst2000.filter.StatelessAuthenticationFilter; +import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; +import com.jasamedika.medifirst2000.security.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,10 +15,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.filter.StatelessAuthenticationFilter; -import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; -import com.jasamedika.medifirst2000.security.service.UserService; +import static com.jasamedika.medifirst2000.constants.Constants.JASAMEDIKA; /** * SpringSecurityConfig class Di sini Kita tidak menggunakan XML Config untuk @@ -28,16 +28,17 @@ import com.jasamedika.medifirst2000.security.service.UserService; @Order(2) public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { + private final UserService userService; + + private final TokenAuthenticationService tokenAuthenticationService; + @Autowired private RestAuthenticationEntryPoint restAuthenticationEntryPoint; - private final UserService userService; - private final TokenAuthenticationService tokenAuthenticationService; - public SpringSecurityConfig() { super(true); this.userService = new UserService(); - tokenAuthenticationService = new TokenAuthenticationService(Constants.JASAMEDIKA, userService); + tokenAuthenticationService = new TokenAuthenticationService(JASAMEDIKA, userService); } @Override diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java index a988c69d..a4b9389c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java @@ -1,11 +1,10 @@ package com.jasamedika.medifirst2000.security.handler; +import com.jasamedika.medifirst2000.security.service.UserService; import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; - import org.springframework.security.core.userdetails.User; -import com.jasamedika.medifirst2000.security.service.UserService; +import static io.jsonwebtoken.SignatureAlgorithm.HS512; /** * TokenHandler class using jjwt @@ -29,8 +28,8 @@ public class TokenHandler { } public String createTokenForUser(User user) { - return Jwts.builder().setHeaderParam("typ", "JWT").setSubject(user.getUsername()) - .signWith(SignatureAlgorithm.HS512, secret).compact(); + return Jwts.builder().setHeaderParam("typ", "JWT").setSubject(user.getUsername()).signWith(HS512, secret) + .compact(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java index 0777640a..756f9eb2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java @@ -23,5 +23,4 @@ public @interface AppPermission { int SPECIALS = 600; int value(); - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java index 0fed5358..456b91cc 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java @@ -1,9 +1,9 @@ package com.jasamedika.medifirst2000.security.service; import com.fasterxml.jackson.core.JsonParseException; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.security.handler.TokenHandler; import com.jasamedika.medifirst2000.security.model.UserAuthentication; +import lombok.NoArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.User; import org.springframework.stereotype.Component; @@ -11,19 +11,19 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.util.Objects; +import static com.jasamedika.medifirst2000.core.web.WebConstants.AUTH_HEADER_NAME; + /** * TokenAuthenticationService class * * @author Roberto */ +@NoArgsConstructor @Component public class TokenAuthenticationService { public static TokenHandler tokenHandler; - public TokenAuthenticationService() { - } - public TokenAuthenticationService(String secret, UserService userService) { tokenHandler = new TokenHandler(secret, userService); } @@ -34,7 +34,7 @@ public class TokenAuthenticationService { } public Authentication getAuthentication(HttpServletRequest request) throws JsonParseException { - String token = request.getHeader(WebConstants.AUTH_HEADER_NAME); + String token = request.getHeader(AUTH_HEADER_NAME); if (token != null) { final User user = tokenHandler.parseUserFromToken(token); if (user != null) @@ -44,7 +44,7 @@ public class TokenAuthenticationService { return null; final String[] tokens = request.getQueryString().split("&"); for (String tokenTemp : tokens) { - if (tokenTemp.toLowerCase().contains(WebConstants.AUTH_HEADER_NAME.toLowerCase())) { + if (tokenTemp.toLowerCase().contains(AUTH_HEADER_NAME.toLowerCase())) { token = tokenTemp.split("=")[1]; final User user = tokenHandler.parseUserFromToken(token); if (user != null) { diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java index a40346c1..77f42ce2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java @@ -11,9 +11,10 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.List; +import static java.util.Collections.singletonList; + /** * UserService implements * org.springframework.security.core.userdetails.UserDetailsService @@ -39,8 +40,7 @@ public class UserService implements UserDetailsService { throw new UsernameNotFoundException("user not found"); LoginUser loginUser = loginUsers.get(0); GrantedAuthority authority = new SimpleGrantedAuthority("USER"); - User userDetails = new User(loginUser.getNamaUser(), loginUser.getKataSandi(), - Collections.singletonList(authority)); + User userDetails = new User(loginUser.getNamaUser(), loginUser.getKataSandi(), singletonList(authority)); detailsChecker.check(userDetails); return userDetails; } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java index 431e147c..da710176 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java @@ -1,26 +1,25 @@ package com.jasamedika.medifirst2000.util.rest; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.NoArgsConstructor; import org.springframework.stereotype.Component; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; +import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES; +import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT; +@NoArgsConstructor @Component public class JacksonConfiguration { - public JacksonConfiguration() { - } - public JacksonConfiguration(ObjectMapper mapper) { configureJackson(mapper); } public static void configureJackson(ObjectMapper mapper) { - mapper.enable(SerializationFeature.INDENT_OUTPUT); - mapper.setSerializationInclusion(Include.NON_NULL); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.enable(INDENT_OUTPUT); + mapper.setSerializationInclusion(NON_NULL); + mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false); } } diff --git a/jasamedika-web/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java b/jasamedika-web/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java index 03d823bf..c2a8bee1 100644 --- a/jasamedika-web/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java +++ b/jasamedika-web/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java @@ -17,6 +17,7 @@ public class JsonViewSupportFactoryBean implements InitializingBean { @Autowired private RequestMappingHandlerAdapter adapter; + private final JsonViewMessageConverter converter; public JsonViewSupportFactoryBean() {