From c36a4e2badd8d99c7e42a3595248dde82001f956 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 6 Jan 2025 10:39:03 +0700 Subject: [PATCH] Update controller Clean code --- .../service/PersetujuanUmumService.java | 10 +- .../RegistrasiPelayananPasienService.java | 12 +- .../RegistrasiPelayananPasienServiceImpl.java | 73 +-- .../ProdukDetailLabAnatomiController.java | 126 ++-- .../controller/ProdukHukumController.java | 119 ---- .../ProdukKeslingNilaiNormalController.java | 64 +- .../ProduksiNonSterilController.java | 164 ----- .../controller/ProgramController.java | 138 ++-- ...ramDanPerencanaanPenangananController.java | 133 ---- .../ProgramKerjaStrategisController.java | 130 ++-- .../controller/PropinsiController.java | 113 ---- .../controller/ProsesCuciController.java | 101 ++- .../ProsesSterilisasiAlatController.java | 59 -- .../PsrsPermintaanPerbaikanController.java | 604 +++++++----------- .../controller/RadiologiController.java | 124 ++-- .../controller/RefackingController.java | 120 ---- .../controller/RegistrasiAsetController.java | 207 +++--- .../RegistrasiMasukRuanganController.java | 110 ---- .../RegistrasiPasienController.java | 312 ++++----- ...egistrasiPasienGawatDaruratController.java | 128 ++-- .../RegistrasiPasienOnlineController.java | 277 +++----- .../RegistrasiPasienSmsController.java | 256 -------- .../RegistrasiPelayananController.java | 142 +--- .../RegistrasiPelayananPasienController.java | 133 ---- ...egistrasiPelayananRawatInapController.java | 116 ---- .../RehabilitasiAsesmenController.java | 224 +++---- .../RekapGajiPegawaiController.java | 103 +-- 27 files changed, 1008 insertions(+), 3090 deletions(-) delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PersetujuanUmumService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PersetujuanUmumService.java index f4b0333a..859cf7b8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PersetujuanUmumService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PersetujuanUmumService.java @@ -1,18 +1,16 @@ package com.jasamedika.medifirst2000.service; -import java.util.Date; +import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum; +import com.jasamedika.medifirst2000.vo.PersetujuanUmumVO; + import java.util.List; import java.util.Map; -import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum; -import com.jasamedika.medifirst2000.entities.PersetujuanUmum; -import com.jasamedika.medifirst2000.vo.PersetujuanUmumVO; - public interface PersetujuanUmumService { Map savePersetujuanUmum(PersetujuanUmumVO vo); void updateStatusRegistrasi(PersetujuanUmumVO persetujuanUmum); - List findEtiket(String noCm,String tglRegistrasi); + List findEtiket(String noCm,String tglRegistrasi); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPelayananPasienService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPelayananPasienService.java index b40f1727..5cb55464 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPelayananPasienService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPelayananPasienService.java @@ -1,22 +1,18 @@ package com.jasamedika.medifirst2000.service; - -import java.util.Date; -import java.util.List; -import java.util.Map; - import com.jasamedika.medifirst2000.dto.AntrianPasien; -import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; import com.jasamedika.medifirst2000.entities.Pasien; import com.jasamedika.medifirst2000.entities.PasienDaftar; import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; import com.jasamedika.medifirst2000.vo.HasilTriaseVO; import com.jasamedika.medifirst2000.vo.MasukKamarVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananCustomVO; import com.jasamedika.medifirst2000.vo.PemeriksaanSelanjutnyaVO; import com.jasamedika.medifirst2000.vo.RegistrasiPelayananPasienVO; +import java.util.List; +import java.util.Map; + public interface RegistrasiPelayananPasienService extends BaseVoService { @@ -39,7 +35,7 @@ public interface RegistrasiPelayananPasienService extends BaseVoService findAllPasien(String startDate, String endDate); - List findAntrian(String noRec); + List findAntrian(String noRec); AntrianPasien getNomorUrutPasienbyJenis(String jenis); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananPasienServiceImpl.java index 05211838..f223b243 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananPasienServiceImpl.java @@ -1,66 +1,25 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - +import com.jasamedika.medifirst2000.converter.*; +import com.jasamedika.medifirst2000.converter.base.BaseVoConverter; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dto.AntrianPasien; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PasienDaftarService; +import com.jasamedika.medifirst2000.service.PasienService; +import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; +import com.jasamedika.medifirst2000.service.SuratPermintaanMasukService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestParam; -import com.jasamedika.medifirst2000.converter.KamarConverter; -import com.jasamedika.medifirst2000.converter.KasusPenyakitConverter; -import com.jasamedika.medifirst2000.converter.RegistrasiPelayananPasienConverter; -import com.jasamedika.medifirst2000.converter.RuanganConverter; -import com.jasamedika.medifirst2000.converter.TempatTidurConverter; -import com.jasamedika.medifirst2000.converter.base.BaseVoConverter; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.AntrianPasienRegistrasiDao; -import com.jasamedika.medifirst2000.dao.OrderPelayananDao; -import com.jasamedika.medifirst2000.dao.PasienDaftarDao; -import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao; -import com.jasamedika.medifirst2000.dao.StatusBedDao; -import com.jasamedika.medifirst2000.dao.TempatTidurDao; -import com.jasamedika.medifirst2000.dto.AntrianPasien; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; -import com.jasamedika.medifirst2000.entities.HasilTriase; -import com.jasamedika.medifirst2000.entities.Kamar; -import com.jasamedika.medifirst2000.entities.KasusPenyakit; -import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.PapKebutuhanEdukasi; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PasienDaftar; -import com.jasamedika.medifirst2000.entities.PersetujuanUmum; -import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.TempatTidur; -import com.jasamedika.medifirst2000.enums.StatusAntrianEnum; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PasienDaftarService; -import com.jasamedika.medifirst2000.service.PasienService; -import com.jasamedika.medifirst2000.service.PersetujuanUmumService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; -import com.jasamedika.medifirst2000.service.SuratPermintaanMasukService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.HasilTriaseVO; -import com.jasamedika.medifirst2000.vo.MasukKamarVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananCustomVO; -import com.jasamedika.medifirst2000.vo.PemeriksaanSelanjutnyaVO; -import com.jasamedika.medifirst2000.vo.PersetujuanUmumVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananPasienVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; -import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO; +import java.util.*; /** * Implement class for PasienService @@ -368,9 +327,9 @@ public class RegistrasiPelayananPasienServiceImpl extends BaseVoServiceImpl } @Override - public List findAntrian(String noRec) { + public List findAntrian(String noRec) { AntrianPasienRegistrasi antrianPasienRegistrasi = antrianPasienRegistrasiDao.findByNoRec(noRec); - List list = new ArrayList(); + List list = new ArrayList<>(); Long count = (long)0; AntrianPasien antrian = new AntrianPasien(); if (antrianPasienRegistrasi != null) { 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 c3ac9af6..1771c9e8 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 @@ -1,34 +1,34 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.ProdukDetailLabAnatomi; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ProdukDetailLabAnatomiService; +import com.jasamedika.medifirst2000.vo.ProdukDetailLabAnatomiVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProdukDetailLabAnatomiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ProdukDetailLabAnatomiVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; /** * Controller class for ProdukDetailLabAnatomiController @@ -37,76 +37,38 @@ import com.jasamedika.medifirst2000.vo.ProdukDetailLabAnatomiVO; */ @RestController @RequestMapping("/laboratorium-anatomi") -@JsonIgnoreProperties(ignoreUnknown = true) -public class ProdukDetailLabAnatomiController extends LocaleController implements - IBaseRestController { - - private static final Logger LOGGER = LoggerFactory.getLogger(ProdukDetailLabAnatomiController.class); +@JsonIgnoreProperties(ignoreUnknown = true) +public class ProdukDetailLabAnatomiController extends LocaleController { + + private static final Logger LOGGER = getLogger(ProdukDetailLabAnatomiController.class); @Autowired - private ProdukDetailLabAnatomiService produkDetailLabAnatomiService; + private ProdukDetailLabAnatomiService produkDetailLabAnatomiService; - @RequestMapping(value = "/save-laboratorium-anatomi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody List vos,HttpServletRequest request) { + @RequestMapping(value = "/save-laboratorium-anatomi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody List vos, + HttpServletRequest request) { try { - Map result=null; - for(ProdukDetailLabAnatomiVO vo:vos){ + Map result = null; + for (ProdukDetailLabAnatomiVO vo : vos) result = produkDetailLabAnatomiService.addProdukDetailLabAnatomi(vo); + mapHeaderMessage.clear(); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - if (null != result){ - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }else{ - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - SaveLog("Laboratorium Patologi Anatomi", "Laboratorium",request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - + SaveLog("Laboratorium Patologi Anatomi", "Laboratorium", 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 addProdukDetailLabAnatomi", 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 addProdukDetailLabAnatomi", 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(ProdukDetailLabAnatomiVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(ProdukDetailLabAnatomiVO 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/ProdukHukumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java deleted file mode 100644 index effc368b..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLConnection; -import java.nio.charset.Charset; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -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.util.FileCopyUtils; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.entities.DokumenTemplate; -import com.jasamedika.medifirst2000.service.ProdukHukumService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AgamaVO; -import com.jasamedika.medifirst2000.vo.DokumenTemplateVO; - -@RestController -@RequestMapping("/produk-hukum") -public class ProdukHukumController extends LocaleController { - - @Autowired - private ProdukHukumService produkHukumService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(ProdukHukumController.class); - - @RequestMapping(value="/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity uploadTemplateSurat( - @RequestBody DokumenTemplateVO dokumenTemplateVO, - HttpServletRequest request) { - String result = produkHukumService.uploadDocumentTemplateSurat(dokumenTemplateVO); - if (result != null) { - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - } else { - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - } - - @RequestMapping(value="/download/{id}", method = RequestMethod.GET) - public void downloadFileDokumenTemplate(HttpServletResponse response, @PathVariable("id") Integer id) throws IOException { - DokumenTemplate result= produkHukumService.findById(id); - File file = new File(result.getFileLocation()); - System.out.println(); - if(!file.exists()){ - String errorMessage = "Sorry. The file you are looking for does not exist"; - System.out.println(errorMessage); - OutputStream outputStream = response.getOutputStream(); - outputStream.write(errorMessage.getBytes(Charset.forName("UTF-8"))); - outputStream.close(); - return; - } - - String mimeType= URLConnection.guessContentTypeFromName(file.getName()); - if(mimeType==null){ - System.out.println("mimetype is not detectable, will take default"); - mimeType = "application/octet-stream"; - } - - System.out.println("mimetype : "+mimeType); - - response.setContentType(mimeType); - - /* "Content-Disposition : inline" will show viewable types [like images/text/pdf/anything viewable by browser] right on browser - while others(zip e.g) will be directly downloaded [may provide save as popup, based on your browser setting.]*/ - response.setHeader("Content-Disposition", String.format("inline; filename=\"" + result.getFileName() +"\"")); - - - /* "Content-Disposition : attachment" will be directly download, may provide save as popup, based on your browser setting*/ - //response.setHeader("Content-Disposition", String.format("attachment; filename=\"%s\"", file.getName())); - - response.setContentLength((int)file.length()); - - InputStream inputStream = new BufferedInputStream(new FileInputStream(file)); - - //Copy bytes from source to destination(outputstream in this example), closes both streams. - FileCopyUtils.copy(inputStream, response.getOutputStream()); - } - @RequestMapping(value = "/get-all", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public List getAllDokumenTemplate( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "namaSurat") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @RequestParam(value = "dateStart", required = false) String dateStart, - @RequestParam(value = "dateEnd", required = false) String dateEnd, - @RequestParam(value = "id", required = false) Integer suratId) { - List resultPageMap = produkHukumService.getAllDokumenTemplate(page, limit, sort, dir, dateStart, dateEnd, suratId); - - return resultPageMap; - } -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java index 9d06299d..1a6b75fe 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java @@ -1,56 +1,56 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ProdukKeslingNilaiNormalService; +import com.jasamedika.medifirst2000.vo.ProdukKeslingNilaiNormalVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProdukKeslingNilaiNormalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/produk-kesling-nilai-normal") -public class ProdukKeslingNilaiNormalController extends LocaleController{ - +public class ProdukKeslingNilaiNormalController extends LocaleController { + + private static final Logger LOGGER = getLogger(ProdukKeslingNilaiNormalController.class); + @Autowired private ProdukKeslingNilaiNormalService produkKeslingNilaiNormalService; - - private static final Logger LOGGER = LoggerFactory.getLogger(ProdukKeslingNilaiNormalController.class); - - @RequestMapping(value = "/get-produk-kesling-nilai-normal", method = RequestMethod.GET) - public ResponseEntity> getJenisLimbahB3Masuk(HttpServletRequest request,@RequestParam(value = "jenisPemeriksaanId", required = true) Integer jenisPemeriksaanId) { + @RequestMapping(value = "/get-produk-kesling-nilai-normal", method = GET) + public ResponseEntity> getJenisLimbahB3Masuk(HttpServletRequest request, + @RequestParam(value = "jenisPemeriksaanId") Integer jenisPemeriksaanId) { try { - Map result = produkKeslingNilaiNormalService.getProdukKeslingNilaiNormalService(jenisPemeriksaanId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + Map result = produkKeslingNilaiNormalService + .getProdukKeslingNilaiNormalService(jenisPemeriksaanId); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pengendali", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getProdukKeslingNilaiNormalService", 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 getProdukKeslingNilaiNormalService", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java deleted file mode 100644 index ca56da19..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProduksiNonSterilService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PelayananProduksiVO; -import com.jasamedika.medifirst2000.vo.ProduksiNonSterilVO; - -@RestController -@RequestMapping("/produksi-non-steril") -public class ProduksiNonSterilController extends LocaleController implements -IBaseRestController { - - @Autowired - private ProduksiNonSterilService produksiNonSterilService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(ProduksiNonSterilController.class); - - - @RequestMapping(value = "/save-produksi-non-steril/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody ProduksiNonSterilVO vo, HttpServletRequest request) { - - try { - Map result=produksiNonSterilService.addProduksiNonSteril(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 Pelayanan Admixture", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pelayanan Admixture", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-produksi-non-steril/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> editVO(@Valid @RequestBody ProduksiNonSterilVO vo, HttpServletRequest request) { - - try { - Map result=produksiNonSterilService.updateProduksiNonSteril(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Pelayanan Admixture", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Pelayanan Admixture", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - -// @RequestMapping(value = "/get-barang-medis/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) -// public ResponseEntity> getBarangMedis(HttpServletRequest request) { -// -// try { -// Map result=produksiNonSterilService.getBarangMedis(); -// if (null != result) -// mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); -// return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); -// } catch (ServiceVOException e) { -// LOGGER.error("Got exception {} when update Pelayanan Admixture", e.getMessage()); -// addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, -// e.getMessage()); -// return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, -// mapHeaderMessage); -// } catch (JpaSystemException jse) { -// LOGGER.error("Got exception {} when update Pelayanan Admixture", jse.getMessage()); -// addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, -// jse.getMessage()); -// return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, -// mapHeaderMessage); -// } -// } - - @RequestMapping(value = "/find-barang-medis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findBarangMedis(HttpServletRequest request) { - Map result = produksiNonSterilService.getBarangMedis(); - if(CommonUtil.isNotNullOrEmpty(result)){ - 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,mapHeaderMessage); - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - - @Override - public ResponseEntity addVO(PelayananProduksiVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(PelayananProduksiVO vo) { - return null; - } - - - @Override - public ResponseEntity deleteVO(Integer id) { - - return null; - } - - - @Override - public ResponseEntity> getAllVO() { - return null; - } - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java index c58384be..99de1261 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 @@ -1,123 +1,75 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.Program; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ProgramService; +import com.jasamedika.medifirst2000.vo.ProgramVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProgramService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ProgramVO; +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_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.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("/program") public class ProgramController extends LocaleController { - + + private static final Logger LOGGER = getLogger(ProgramController.class); + @Autowired - private ProgramService programService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(ProgramController.class); - - @RequestMapping(value = "/save-program", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody ProgramVO vo,HttpServletRequest request) { - - try{ + private ProgramService programService; + + @RequestMapping(value = "/save-program", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody ProgramVO vo, HttpServletRequest request) { + try { Map result = programService.addProgram(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 Program", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when addProgram", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Program", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addProgram", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-program", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody ProgramVO vo,HttpServletRequest request) { - - try{ - Map result = programService.updateProgram(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 Program", 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 Program", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-program", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-all-program", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findAllProgram(HttpServletRequest request) { - Map result=null; try { - result = programService.findAllProgram(); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - + Map result = programService.findAllProgram(); + 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)); } - }catch(Exception ex){ - ex.printStackTrace(); + return getJsonResponse(result, OK); + } catch (Exception ex) { + throw new ServiceVOException(ex.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/find-one-program", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findOneProgram(HttpServletRequest request) { - Map result=null; - try { - result = programService.findOneProgram(); - 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 ex){ - ex.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java deleted file mode 100644 index 539f6449..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProgramDanPerencanaanPenangananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ProgramDanPerencanaanPenangananVO; - -@RestController -@RequestMapping("/programDanPerencanaanPenanganan") -public class ProgramDanPerencanaanPenangananController extends LocaleController implements IBaseRestController{ - - @Autowired - private ProgramDanPerencanaanPenangananService programDanPerencanaanPenangananService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(ProgramDanPerencanaanPenangananController.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(ProgramDanPerencanaanPenangananVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(ProgramDanPerencanaanPenangananVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value = "/save-program-penanganan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody ProgramDanPerencanaanPenangananVO vo, HttpServletRequest request) { - - try { - Map result=programDanPerencanaanPenangananService.saveCatatanPerkembangan(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 Program dan Perencanaan Penanganan", 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 Program dan Perencanaan Penanganan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-program-penanganan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> editVO(@Valid @RequestBody ProgramDanPerencanaanPenangananVO vo, HttpServletRequest request) { - - try { - Map result=programDanPerencanaanPenangananService.updateCatatanPerkembangan(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 Program dan Perencanaan Penanganan", 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 Program dan Perencanaan Penanganan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-by-noCm/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoCm(@RequestParam(value = "noCm", required = false, defaultValue = "000000000000001") String noCm,HttpServletRequest request) { - Map result = programDanPerencanaanPenangananService.findByNoCm(noCm); - Boolean dataFound=new Boolean((boolean) result.get("dataFound")); - if(dataFound){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java index dacdc79c..b74963ee 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 @@ -1,118 +1,76 @@ package com.jasamedika.medifirst2000.controller; -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 com.jasamedika.medifirst2000.constants.MessageResource; +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.vo.PasienVO; +import com.jasamedika.medifirst2000.vo.ProgramKerjaStrategisVO; +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.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -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 javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +import java.util.Map; -import net.kaczmarzyk.spring.data.jpa.domain.Equal; -import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +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("/program-kerja-strategis") -public class ProgramKerjaStrategisController extends LocaleController -implements IBaseRestController{ +public class ProgramKerjaStrategisController extends LocaleController { + + private static final Logger LOGGER = getLogger(ProgramKerjaStrategisController.class); @Autowired private ProgramKerjaStrategisService programService; - - 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(ProgramKerjaStrategisVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(ProgramKerjaStrategisVO 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) - public ResponseEntity> findAll( + @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 = "periode") 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 = programService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) { + Map result = programService.findAll(page, take, sort, dir, spec); + return constructListPageResult(result); } - @RequestMapping(value="/save/", method= RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody ProgramKerjaStrategisVO vo,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody ProgramKerjaStrategisVO vo, + HttpServletRequest request) { + try { Map result = programService.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 programKerjaStrategis", 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 programKerjaStrategis", 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/PropinsiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java deleted file mode 100644 index f3702436..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PropinsiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PropinsiVO; - -/** - * Controller class for Propinsi Business - * - * @author Roberto - */ -@RestController -@RequestMapping("/propinsi") -@JsonIgnoreProperties(ignoreUnknown = true) -public class PropinsiController extends LocaleController implements IBaseRestController { - - @Autowired - private PropinsiService propinsiService; - - - private static final Logger LOGGER = LoggerFactory.getLogger(PropinsiController.class); - - - @RequestMapping(value = "/save-propinsi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity savePropinsi(@Valid @RequestBody PropinsiVO vo) { - try { - PropinsiVO result = propinsiService.add(vo); - if (null != result) - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ""); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("", HttpStatus.CREATED); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Propinsi", 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 Propinsi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - - @Override - public ResponseEntity addVO(PropinsiVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(PropinsiVO vo) { - return null; - } - - - @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; - } - - - - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java index a6c22f4c..bf12d1eb 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java @@ -1,101 +1,76 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ProsesCuciService; +import com.jasamedika.medifirst2000.vo.ProsesCuciVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProsesCuciService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ProsesCuciVO; +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("/proses-cuci") public class ProsesCuciController extends LocaleController { + private static final Logger LOGGER = getLogger(ProsesCuciController.class); + @Autowired private ProsesCuciService prosesCuciService; - private static final Logger LOGGER = LoggerFactory.getLogger(ProsesCuciController.class); - - @RequestMapping(value = "/save-proses-cuci/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-proses-cuci/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveProsesCuci(@Valid @RequestBody ProsesCuciVO vo, HttpServletRequest request) { try { Map result = prosesCuciService.saveProsesCuci(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 Proses Cuci", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveProsesCuci", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Proses Cuci", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveProsesCuci", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/find-all-proses-cuci/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-all-proses-cuci/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findAllProsesCuci(HttpServletRequest request) { - try { Map result = prosesCuciService.findAllProsesCuci(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get All Proses Cuci", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllProsesCuci", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get All Proses Cuci", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllProsesCuci", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - - @RequestMapping(value = "/delete-proses-cuci/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteProsesCuci(@RequestParam(value = "id", required = true) Integer id) { - - try { - if (prosesCuciService.deleteProsesCuci(id) == true) - return RestUtil.getJsonResponse(id + " Dihapus", HttpStatus.CREATED); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete Proses Cuci", 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 Proses Cuci", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java deleted file mode 100644 index 3422d79e..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ProsesSterilisasiAlatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ProsesSterilisasiAlatVO; - -@RestController -@RequestMapping("/proses-sterilisasi-alat") -public class ProsesSterilisasiAlatController extends LocaleController { - - @Autowired - private ProsesSterilisasiAlatService prosesSterilisasiAlatService; - - private static final Logger LOGGER = LoggerFactory.getLogger(ProsesSterilisasiAlatController.class); - - @RequestMapping(value = "/save-proses-sterilisasi-alat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesSterilisasiAlat(@Valid @RequestBody ProsesSterilisasiAlatVO vo, - HttpServletRequest request) { - try { - Map result = prosesSterilisasiAlatService.saveProsesSterilisasiAlat(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Proses Sterilisasi Alat", 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 Proses Sterilisasi Alat", 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/PsrsPermintaanPerbaikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java index 87292953..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 @@ -1,162 +1,135 @@ package com.jasamedika.medifirst2000.controller; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.Ruangan; 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.AkunVO; -import com.jasamedika.medifirst2000.vo.KirimPerbaikanVO; -import com.jasamedika.medifirst2000.vo.PemeliharaanVO; -import com.jasamedika.medifirst2000.vo.PenjadwalanHeaderVO; -import com.jasamedika.medifirst2000.vo.PerbaikanVO; -import com.jasamedika.medifirst2000.vo.PermintaanPerbaikanVO; -import com.jasamedika.medifirst2000.vo.SukuCadangLuarVO; +import com.jasamedika.medifirst2000.vo.*; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.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.servlet.http.HttpServletResponse; +import javax.validation.Valid; +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("/psrsPermintaanPerbaikan") -public class PsrsPermintaanPerbaikanController extends LocaleController{ - +public class PsrsPermintaanPerbaikanController extends LocaleController { + + private static final Logger LOGGER = getLogger(PsrsPermintaanPerbaikanController.class); + @Autowired private PsrsPermintaanPerbaikanService psrsPermintaanPerbaikanService; - + @Autowired private StrukOrderService strukOrderService; - + @Autowired private StokProdukGlobalService stokProdukGlobalService; - - private static final Logger LOGGER = LoggerFactory.getLogger(PsrsPermintaanPerbaikanController.class); - - @RequestMapping(value = "/save-permintaan-perbaikan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePermintaanPerbaikan(@Valid @RequestBody PermintaanPerbaikanVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-permintaan-perbaikan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePermintaanPerbaikan(@Valid @RequestBody PermintaanPerbaikanVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = psrsPermintaanPerbaikanService.savePermintaanPerbaikan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePermintaanPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePermintaanPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } + } - } - - @RequestMapping(value = "/get-aset-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getAsetByRuangan() { - Map data = psrsPermintaanPerbaikanService.getAsetByRuangan(); - return data; - } - - @RequestMapping(value = "/get-ruangan-by-user-login", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-ruangan-by-user-login", method = GET, produces = APPLICATION_JSON_VALUE) public Map getRuanganByUserLogin() { - Ruangan r=psrsPermintaanPerbaikanService.getRuanganByUserLogin(); - Map data = new HashMap(); + Ruangan r = psrsPermintaanPerbaikanService.getRuanganByUserLogin(); + Map data = new HashMap<>(); data.put("id", r.getId()); data.put("namaRuangan", r.getNamaRuangan()); return data; } - - @RequestMapping(value = "/get-ruangan-tujuan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-ruangan-tujuan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getRuanganTujuan() { - Ruangan r=psrsPermintaanPerbaikanService.getRuanganTujuan(); - Map data = new HashMap(); + Ruangan r = psrsPermintaanPerbaikanService.getRuanganTujuan(); + Map data = new HashMap<>(); data.put("id", r.getId()); data.put("namaRuangan", r.getNamaRuangan()); return data; } - - @RequestMapping(value = "/get-user-login", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-user-login", method = GET, produces = APPLICATION_JSON_VALUE) public Map getUserLogin() { - Pegawai p=psrsPermintaanPerbaikanService.getPegawaiByUserLogin(); - Map data = new HashMap(); + Pegawai p = psrsPermintaanPerbaikanService.getPegawaiByUserLogin(); + Map data = new HashMap<>(); data.put("id", p.getId()); data.put("namaPegawai", p.getNamaLengkap()); return data; } - - - @RequestMapping(value = "/get-aset-by-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getAsetByProduk(@RequestParam(value = "produkId") Integer produkId) { - Map data = psrsPermintaanPerbaikanService.getAsetByProduk(produkId); - return data; - } - - @RequestMapping(value = "/get-kontrak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getKotrak() { - Map data = psrsPermintaanPerbaikanService.getKotrak(); - return data; - } - - @RequestMapping(value = "/get-kontrak-detail", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getKontrakDetail(@RequestParam(value = "noRec") String noRec) { - Map data = psrsPermintaanPerbaikanService.getKontrakDetail(noRec); - return data; - } - - @RequestMapping(value = "/get-detail-permintaan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getDetailPermintaan(@RequestParam(value = "noRec") String noRec) { - Map data = psrsPermintaanPerbaikanService.getDetailPermintaan(noRec); - return data; - } - - @RequestMapping(value = "/pre-add-perbaikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map preAddPerbaikan(@RequestParam(value = "noRec") String noRec) { - Map data = psrsPermintaanPerbaikanService.preAddPerbaikan(noRec); - return data; - } - - @RequestMapping(value = "/pre-add-pemeliharaan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map preAddPemeliharaan(@RequestParam(value = "noRec") String noRec) { - Map data = psrsPermintaanPerbaikanService.preAddPemeliharaan(noRec); - return data; - } - - @RequestMapping(value = "/get-no-order-perbaikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getNoPemusnahan() { - Map result = new HashMap(); + @RequestMapping(value = "/get-kontrak", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getKotrak() { + return psrsPermintaanPerbaikanService.getKotrak(); + } + + @RequestMapping(value = "/get-kontrak-detail", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getKontrakDetail(@RequestParam(value = "noRec") String noRec) { + return psrsPermintaanPerbaikanService.getKontrakDetail(noRec); + } + + @RequestMapping(value = "/get-detail-permintaan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDetailPermintaan(@RequestParam(value = "noRec") String noRec) { + return psrsPermintaanPerbaikanService.getDetailPermintaan(noRec); + } + + @RequestMapping(value = "/pre-add-perbaikan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map preAddPerbaikan(@RequestParam(value = "noRec") String noRec) { + return psrsPermintaanPerbaikanService.preAddPerbaikan(noRec); + } + + @RequestMapping(value = "/pre-add-pemeliharaan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map preAddPemeliharaan(@RequestParam(value = "noRec") String noRec) { + return psrsPermintaanPerbaikanService.preAddPemeliharaan(noRec); + } + + @RequestMapping(value = "/get-no-order-perbaikan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getNoPemusnahan() { + Map result = new HashMap<>(); result.put("noOrderPerbaikan", strukOrderService.preFormatNoUrut("Order Perbaikan", "PBK")); return result; } - - @RequestMapping(value = "/get-informasi-perbaikan-masuk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map informasiPerbaikanMasuk( - + + @RequestMapping(value = "/get-informasi-perbaikan-masuk", method = GET, produces = APPLICATION_JSON_VALUE) + public Map informasiPerbaikanMasuk( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "10000") Integer limit, @RequestParam(value = "sort", required = false) String sort, @@ -165,15 +138,13 @@ public class PsrsPermintaanPerbaikanController extends LocaleController{ @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "noOrder", required = false) String noOrder, @RequestParam(value = "jenisOrder", required = false) String jenisOrder) { - Map resultPageMap = strukOrderService.getInformasiPerbaikanMasuk(page, limit, sort, dir, dateStart,dateEnd,noOrder,jenisOrder); - - return resultPageMap; + return strukOrderService.getInformasiPerbaikanMasuk(page, limit, sort, dir, dateStart, dateEnd, noOrder, + jenisOrder); } - - @RequestMapping(value = "/get-informasi-perbaikan-keluar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map informasiPerbaikanKeluar( - + @RequestMapping(value = "/get-informasi-perbaikan-keluar", method = GET, produces = APPLICATION_JSON_VALUE) + public Map informasiPerbaikanKeluar( + @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "10000") Integer limit, @RequestParam(value = "sort", required = false) String sort, @@ -182,199 +153,176 @@ public class PsrsPermintaanPerbaikanController extends LocaleController{ @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "noOrder", required = false) String noOrder, @RequestParam(value = "jenisOrder", required = false) String jenisOrder) { - - Map resultPageMap = strukOrderService.getInformasiPerbaikanKeluar(page, limit, sort, dir, dateStart,dateEnd,noOrder,jenisOrder); - - return resultPageMap; + return strukOrderService.getInformasiPerbaikanKeluar(page, limit, sort, dir, dateStart, dateEnd, noOrder, + jenisOrder); } - - @RequestMapping(value = "/kirim-perbaikan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveKirimPerbaikan(@Valid @RequestBody KirimPerbaikanVO vo,HttpServletRequest request,HttpServletResponse response) { - - - Map result = psrsPermintaanPerbaikanService.kirimPerbaikan(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + @RequestMapping(value = "/kirim-perbaikan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveKirimPerbaikan(@Valid @RequestBody KirimPerbaikanVO vo, + HttpServletRequest request, HttpServletResponse response) { + Map result = psrsPermintaanPerbaikanService.kirimPerbaikan(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } - - @RequestMapping(value = "/save-verifikasi-perbaikan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveVerifikasiPerbaikan(@Valid @RequestBody KirimPerbaikanVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-verifikasi-perbaikan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveVerifikasiPerbaikan(@Valid @RequestBody KirimPerbaikanVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = psrsPermintaanPerbaikanService.saveVerifikasiPerbaikan(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 Penerimaan Barang", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveVerifikasiPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveVerifikasiPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/save-penjadwalan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePenjadwalan(@Valid @RequestBody PenjadwalanHeaderVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-penjadwalan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePenjadwalan(@Valid @RequestBody PenjadwalanHeaderVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = psrsPermintaanPerbaikanService.savePenjadwalan(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 Penerimaan Barang", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePenjadwalan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePenjadwalan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/find-ruangan-asset", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-ruangan-asset", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRuanganRegistrasiAset(HttpServletRequest request) { try { - Map result = psrsPermintaanPerbaikanService.getRuanganPerbaikan(); - 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 = psrsPermintaanPerbaikanService.getRuanganPerbaikan(); + 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 getRuanganRegistrasiAset", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getRuanganPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getRuanganRegistrasiAset", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getRuanganPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/find-produk-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAsetPerbaikan(@RequestParam(value = "id", required = true) Integer id, HttpServletRequest request){ + + @RequestMapping(value = "/find-produk-by-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAsetPerbaikan(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { - Map result = psrsPermintaanPerbaikanService.getProdukPerbaikan(id); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = psrsPermintaanPerbaikanService.getProdukPerbaikan(id); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAsetPerbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getProdukPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAsetPerbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getProdukPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-aset-by-produk-and-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getAsetByProduk(@RequestParam(value = "produkId") Integer produkId,@RequestParam(value = "ruanganId") Integer ruanganId) { - Map data = psrsPermintaanPerbaikanService.getAsetByProdukAndRuangan(produkId,ruanganId); - return data; + + @RequestMapping(value = "/get-aset-by-produk-and-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getAsetByProduk(@RequestParam(value = "produkId") Integer produkId, + @RequestParam(value = "ruanganId") Integer ruanganId) { + return psrsPermintaanPerbaikanService.getAsetByProdukAndRuangan(produkId, ruanganId); } - - - @RequestMapping(value = "/save-perbaikan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePerbaikan(@Valid @RequestBody PerbaikanVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-perbaikan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePerbaikan(@Valid @RequestBody PerbaikanVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = psrsPermintaanPerbaikanService.savePerbaikan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/save-pemeliharaan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePemeliharaan(@Valid @RequestBody PemeliharaanVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-pemeliharaan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePemeliharaan(@Valid @RequestBody PemeliharaanVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = psrsPermintaanPerbaikanService.savePemeliharaan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemeliharaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemeliharaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/save-suku-cadang-luar/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveSukuCadangLuar(@Valid @RequestBody List vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-suku-cadang-luar/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveSukuCadangLuar(@Valid @RequestBody List vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = psrsPermintaanPerbaikanService.saveSukuCadangLuar(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSukuCadangLuar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveSukuCadangLuar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-stok-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getStokRuangan() { - Map resultPageMap = stokProdukGlobalService.getStokRuangan(); - - return resultPageMap; + @RequestMapping(value = "/get-stok-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getStokRuangan() { + return stokProdukGlobalService.getStokRuangan(); } - - @RequestMapping(value = "/verifikasi-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map verifikasiRuangan( - + + @RequestMapping(value = "/verifikasi-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map verifikasiRuangan( @RequestParam(value = "noRecKirimProduk", required = false) String noRec) { - - Map resultPageMap = strukOrderService.verifikasiRuangan(noRec); - - return resultPageMap; + return strukOrderService.verifikasiRuangan(noRec); } - - @RequestMapping(value = "/monitoring", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map monitoring( - + + @RequestMapping(value = "/monitoring", method = GET, produces = APPLICATION_JSON_VALUE) + public Map monitoring( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "10000") Integer limit, @RequestParam(value = "sort", required = false) String sort, @@ -384,127 +332,71 @@ public class PsrsPermintaanPerbaikanController extends LocaleController{ @RequestParam(value = "ruanganId", required = false) Integer ruanganId, @RequestParam(value = "noAset", required = false) String noAset, @RequestParam(value = "produkId", required = false) Integer produkId) { - Map resultPageMap = strukOrderService.monitoringPerbaikan(page, limit, sort, dir, dateStart,dateEnd,ruanganId,noAset,produkId); - - return resultPageMap; + return strukOrderService.monitoringPerbaikan(page, limit, sort, dir, dateStart, dateEnd, ruanganId, noAset, + produkId); } - - @RequestMapping(value = "/detail-monitoring", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailMonitoring( + @RequestMapping(value = "/detail-monitoring", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailMonitoring( @RequestParam(value = "strukOrderId", required = false) String strukOrderId, @RequestParam(value = "noRegistrasiAset", required = false) String noRegistrasiAset) { + return strukOrderService.detailMonitoring(strukOrderId, noRegistrasiAset); + } - Map resultPageMap = strukOrderService.detailMonitoring(strukOrderId,noRegistrasiAset); - - return resultPageMap; + @RequestMapping(value = "/get-lap-permintaan-perbaikan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getLapPermintaanPerbaikan() { + return psrsPermintaanPerbaikanService.getLapPermintaanPerbaikan(); } - - //add by iwankasan - //12.12.2017 - @RequestMapping(value = "/get-lap-permintaan-perbaikan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getLapPermintaanPerbaikan( - ) { - Map data = psrsPermintaanPerbaikanService.getLapPermintaanPerbaikan(); - return data; - } - - @RequestMapping(value = "/get-lap-permintaan-perbaikan-by-date", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-lap-permintaan-perbaikan-by-date", method = GET, produces = APPLICATION_JSON_VALUE) public Map getLapPermintaanPerbaikanByDate( @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate - ) { - Map data = psrsPermintaanPerbaikanService.getLapPermintaanPerbaikanByDate(startDate, endDate); - return data; + @RequestParam(value = "endDate", required = false) String endDate) { + return psrsPermintaanPerbaikanService.getLapPermintaanPerbaikanByDate(startDate, endDate); } - - @RequestMapping(value = "/get-lap-permintaan-perbaikan-by-noorder", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-lap-permintaan-perbaikan-by-noorder", method = GET, produces = APPLICATION_JSON_VALUE) public Map getLapPermintaanPerbaikanByNoTrans( - @RequestParam(value = "noOrder", required = false) String noOrder - ) { - Map data = psrsPermintaanPerbaikanService.getLapPermintaanPerbaikanByNoOrder(noOrder); - return data; + @RequestParam(value = "noOrder", required = false) String noOrder) { + return psrsPermintaanPerbaikanService.getLapPermintaanPerbaikanByNoOrder(noOrder); } - - @RequestMapping(value = "/get-lap-permintaan-perbaikan-by-jenis-order", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-lap-permintaan-perbaikan-by-jenis-order", method = GET, produces = APPLICATION_JSON_VALUE) public Map getLapPermintaanPerbaikanByJenisOrder( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, - @RequestParam(value = "jenisOrder", required = false) String jenisOrder - ) { - Map data = psrsPermintaanPerbaikanService.getLapPermintaanPerbaikanByJenisOrder(jenisOrder, startDate, endDate); - return data; + @RequestParam(value = "jenisOrder", required = false) String jenisOrder) { + return psrsPermintaanPerbaikanService.getLapPermintaanPerbaikanByJenisOrder(jenisOrder, startDate, endDate); } - - @RequestMapping(value = "/get-suku-cadang-by-strukorder", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-suku-cadang-by-strukorder", method = GET, produces = APPLICATION_JSON_VALUE) public Map getOrderSukuCadangbyStrukOrder(String strukOrder) { - Map data = this.psrsPermintaanPerbaikanService.getOrderSukuCadangbyStrukOrder(strukOrder); - return data; + return this.psrsPermintaanPerbaikanService.getOrderSukuCadangbyStrukOrder(strukOrder); } - - @RequestMapping(value = "/get-monitoring-perbaikan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-monitoring-perbaikan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getMonitoringPerbaikan( @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate - ) { - Map data = this.psrsPermintaanPerbaikanService.getMonitoringPerbaikanByDate(startDate, endDate); - return data; + @RequestParam(value = "endDate", required = false) String endDate) { + return this.psrsPermintaanPerbaikanService.getMonitoringPerbaikanByDate(startDate, endDate); } - - @RequestMapping(value = "/get-asset-gedung-by-jenis-asset", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-asset-gedung-by-jenis-asset", method = GET, produces = APPLICATION_JSON_VALUE) public Map getAssetGedungByJenisAsset(Integer idJenis) { - Map data = this.psrsPermintaanPerbaikanService.getAssetGedungByJenisAsset(idJenis); - return data; + return this.psrsPermintaanPerbaikanService.getAssetGedungByJenisAsset(idJenis); } - - @RequestMapping(value = "/get-asset-non-gedung-by-jenis-asset", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getAssetNonGedungByJenisAsset( - @RequestParam(value = "id", required = true) Integer id, - @RequestParam(value="idJenis", required=true) Integer idJenis, HttpServletRequest request) { - Map data = this.psrsPermintaanPerbaikanService.getAssetNonGedungByJenisAsset(id, idJenis); - return data; + + @RequestMapping(value = "/get-asset-non-gedung-by-jenis-asset", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getAssetNonGedungByJenisAsset(@RequestParam(value = "id") Integer id, + @RequestParam(value = "idJenis") Integer idJenis, HttpServletRequest request) { + return this.psrsPermintaanPerbaikanService.getAssetNonGedungByJenisAsset(id, idJenis); } - - @RequestMapping(value = "/get-asset-gedung-by-order-pelayanan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-asset-gedung-by-order-pelayanan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getAssetGedungByOrderPelayanan( - @RequestParam(value = "noOrderPelayanan", required = false) String noOrderPelayanan, HttpServletRequest request) { - Map data = this.psrsPermintaanPerbaikanService.getAssetGedungByOrderPelayanan(noOrderPelayanan); - return data; + @RequestParam(value = "noOrderPelayanan", required = false) String noOrderPelayanan, + HttpServletRequest request) { + return this.psrsPermintaanPerbaikanService.getAssetGedungByOrderPelayanan(noOrderPelayanan); } - - @RequestMapping(value = "/get-asset-non-gedung-by-order-pelayanan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getAssetNonGedungByOrderPelayanan( - @RequestParam(value = "noOrderPelayanan", required = false) String noOrderPelayanan, HttpServletRequest request) { - Map data = this.psrsPermintaanPerbaikanService.getAssetNonGedungByOrderPelayanan(noOrderPelayanan); - return data; - } - - @RequestMapping(value = "/get-asset-by-jenis-produk", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getAssetByJenisProduk(@RequestParam(value="noRec")String noRec, HttpServletRequest request) { - Map data = this.psrsPermintaanPerbaikanService.getRegistrasiAssetByJenisProduk(noRec); - return data; - } - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java index 68280b31..4492b2c6 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java @@ -1,106 +1,106 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.RIS_ReportService; +import com.jasamedika.medifirst2000.service.RadiologiService; +import com.jasamedika.medifirst2000.vo.OrderRadiologiVO; +import com.jasamedika.medifirst2000.vo.StrukOrderVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RIS_ReportService; -import com.jasamedika.medifirst2000.service.RadiologiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.OrderRadiologiVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/radiologi-ris") -public class RadiologiController extends LocaleController{ +public class RadiologiController extends LocaleController { + + private static final Logger LOGGER = getLogger(RadiologiController.class); @Autowired private RadiologiService service; - + @Autowired private RIS_ReportService rIS_ReportService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RadiologiController.class); - @RequestMapping(value = "/save-order-radiologi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderRadiologi(@Valid @RequestBody OrderRadiologiVO vo, HttpServletRequest request) { + @RequestMapping(value = "/save-order-radiologi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveOrderRadiologi(@Valid @RequestBody OrderRadiologiVO vo, + HttpServletRequest request) { try { - Map result = service.saveOrderRadiologi(vo); + Map result = service.saveOrderRadiologi(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 saveOrderRadiologi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveOrderRadiologi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveOrderRadiologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveOrderRadiologi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-order-radiologi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateOrderRadiologi(@Valid @RequestBody StrukOrderVO vo, HttpServletRequest request) { - try { - Map result = service.updateOrderRadiologi(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + @RequestMapping(value = "/update-order-radiologi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> updateOrderRadiologi(@Valid @RequestBody StrukOrderVO vo, + HttpServletRequest request) { + try { + Map result = service.updateOrderRadiologi(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when updateOrderRadiologi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateOrderRadiologi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when updateOrderRadiologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updateOrderRadiologi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-data-report", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-data-report", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataMapping( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { try { List> result = rIS_ReportService.getReportByTglCreate(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 getReportByTglCreate", 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 getReportByTglCreate", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java deleted file mode 100644 index 0a90a994..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RefackingService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RefackingVO; - -@RestController -@RequestMapping("/refacking") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RefackingController extends LocaleController implements -IBaseRestController { - - @Autowired - private RefackingService refackingService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RefackingController.class); - - - @RequestMapping(value = "/save-refacking", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody RefackingVO vo, HttpServletRequest request) { - - try { - Map result=refackingService.addRefacking(vo); - - if (null != result){ - 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.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 = "/find-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findBarangMedis(HttpServletRequest request) { - Map result = refackingService.findProdukRefacking(); - 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,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(RefackingVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(RefackingVO 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/RegistrasiAsetController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java index 97b8c520..4353a500 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 @@ -1,101 +1,88 @@ package com.jasamedika.medifirst2000.controller; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.RegistrasiAset; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.RegistrasiAsetService; +import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO; +import com.jasamedika.medifirst2000.vo.HistoryAlatVO; +import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Map; -import javax.servlet.http.*; -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.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RegistrasiAsetService; -import com.jasamedika.medifirst2000.service.StrukPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO; -import com.jasamedika.medifirst2000.vo.HistoryAlatVO; -import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; +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("/registrasi-aset") -public class RegistrasiAsetController extends LocaleController { +public class RegistrasiAsetController extends LocaleController { + + private static final Logger LOGGER = getLogger(RegistrasiAsetController.class); @Autowired - private StrukPelayananService strukPelayananService; - - @Autowired - private RegistrasiAsetService registrasiAsetService; + private RegistrasiAsetService registrasiAsetService; - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiAsetController.class); - - - @RequestMapping(value = "/save-distribusi-barang/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDistribusiBarang(@Valid @RequestBody DistribusiBarangInvestasiVO vo,HttpServletRequest request,HttpServletResponse response) { - + @RequestMapping(value = "/save-distribusi-barang/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDistribusiBarang(@Valid @RequestBody DistribusiBarangInvestasiVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = registrasiAsetService.saveDistribusiBarang(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Distribusi Barang", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDistribusiBarang", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Distribusi Barang", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDistribusiBarang", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - - @RequestMapping(value = "/save-dokumen/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDokumen(@Valid @RequestBody HistoryAlatVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-dokumen/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDokumen(@Valid @RequestBody HistoryAlatVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = registrasiAsetService.saveDokumen(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 History Alat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDokumen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save History Alat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDokumen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/grid-registrasi-aset") @ResponseBody - public Map gridListAset( + public Map gridListAset( @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, @@ -103,88 +90,52 @@ public class RegistrasiAsetController extends LocaleController resultPageMap = registrasiAsetService.gridListAset(page, limit, sort, dir, periodeAwal,periodeAhir,ruanganId); - - return resultPageMap; + return registrasiAsetService.gridListAset(page, limit, sort, dir, periodeAwal, periodeAhir, ruanganId); } - - - @RequestMapping(value = "/get-detail-aset", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailAset( - @RequestParam(value = "noRec", required = true) String noRec) { - Map kartuPengendliDetailList = registrasiAsetService.detailAset(noRec); - return kartuPengendliDetailList; + + @RequestMapping(value = "/get-detail-aset", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailAset(@RequestParam(value = "noRec") String noRec) { + return registrasiAsetService.detailAset(noRec); } - - @RequestMapping(value = "/update-aset/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateAset(@Valid @RequestBody RegistrasiAsetVO vo,HttpServletRequest request,HttpServletResponse response) { - - - + + @RequestMapping(value = "/update-aset/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> updateAset(@Valid @RequestBody RegistrasiAsetVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = registrasiAsetService.updateAset(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Distribusi Barang", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateAset", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Distribusi Barang", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updateAset", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/download", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map download(@RequestParam(value = "noRec", required = true) Integer noRec,HttpServletResponse response) throws IOException { + + @RequestMapping(value = "/download", method = GET, produces = APPLICATION_JSON_VALUE) + public Map download(@RequestParam(value = "noRec") Integer noRec, HttpServletResponse response) + throws IOException { Map detailAset = registrasiAsetService.getFormatDownload(noRec); String fileName = (String) detailAset.get("namaFile"); String format = (String) detailAset.get("format"); - - String fileType = "application/"+format; - // Find this file id in database to get file name, and file type - - // You must tell the browser the file type you are going to send - // for example application/pdf, text/plain, text/html, image/jpg + String fileType = "application/" + format; response.setContentType(fileType); - - // Make sure to show the download dialog - response.setHeader("Content-disposition", "attachment; filename="+fileName); - - // Assume file name is retrieved from database - // For example D:\\file\\test.pdf - + response.setHeader("Content-disposition", "attachment; filename=" + fileName); File my_file = new File(fileName); - - // This should send the file to browser OutputStream out = response.getOutputStream(); FileInputStream in = new FileInputStream(my_file); byte[] buffer = new byte[4096]; int length; - while ((length = in.read(buffer)) > 0) { + while ((length = in.read(buffer)) > 0) out.write(buffer, 0, length); - } in.close(); out.flush(); - return null; } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/daftar-dokumen") - @ResponseBody - public Map gridListAset(@RequestParam(value = "noRec", required = true) String noRec,@RequestParam(value = "kategori", required = true) String kategori) { - - Map resultPageMap = registrasiAsetService.daftarDokumen(noRec,kategori); - - return resultPageMap; - } - - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java deleted file mode 100644 index 5561b907..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RegistrasiMasukRuanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RegistrasiMasukRuanganVO; - -/** - * Controller class for Registrasi Pasien Business - * - * @author Askur - */ -@RestController -@RequestMapping("/registrasi-masuk-ruangan") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RegistrasiMasukRuanganController extends LocaleController implements - IBaseRestController { - - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiMasukRuanganController.class); - - @Autowired - private RegistrasiMasukRuanganService registrasiMasukRuanganService; - - @RequestMapping(value = "/list-antrian-pasien-diperiksa", method = RequestMethod.GET) - public ResponseEntity> listPasienDaftar() { - List listPasienDaftarVO = registrasiMasukRuanganService.getListAntrianPasienDiPeriksa(); - addHeaderMessage(Constants.MessageInfo.INFO_MESSAGE, "DATA BERHASIL DISIMPAN"); - return RestUtil.getJsonResponse(listPasienDaftarVO, HttpStatus.OK, mapHeaderMessage); - - } - - @RequestMapping(value = "/save-registrasi-masuk-ruangan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity savePasien(@Valid @RequestBody RegistrasiMasukRuanganVO vo) { - try { - RegistrasiMasukRuanganVO result = registrasiMasukRuanganService.add(vo); - - if (null != result) - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ""); - RestUtil.getJsonHttpStatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(RegistrasiMasukRuanganVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(RegistrasiMasukRuanganVO vo) { - return null; - } - - @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; - } - - - -} 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 1c38fda8..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 @@ -1,134 +1,105 @@ package com.jasamedika.medifirst2000.controller; -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.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.entities.HasilTriase; +import com.jasamedika.medifirst2000.entities.PasienDaftar; import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.DataAsuransiService; 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.service.ReportingPelayananRekamMedisService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.DataAsuransiVO; -import com.jasamedika.medifirst2000.vo.PasienDaftarVO; import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.RegistrasiPasienPenunjangVO; import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO; +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.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("/registrasi-pasien") -@JsonIgnoreProperties(ignoreUnknown = true) +@JsonIgnoreProperties(ignoreUnknown = true) public class RegistrasiPasienController extends LocaleController { + private static final Logger LOGGER = getLogger(RegistrasiPasienController.class); + @Autowired private RegistrasiPasienService registrasiPasienService; - + @Autowired - private ReportingPelayananRekamMedisService reportingPelayananRekamMedisService; - - @Autowired - private RegistrasiPelayananService registrasiPelayananService; - + private RegistrasiPelayananService registrasiPelayananService; + @Autowired private HasilTriaseService hasilTriaseService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RegistrasiPasienController.class); - - @RequestMapping(value = "/save-registrasi-pasien", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPasien(@Valid @RequestBody RegistrasiPasienVO vo,HttpServletRequest request) { - try { - if(vo.getPasien().getNamaDepan()!=null) - vo.getPasien().setNamaPasien(vo.getPasien().getNamaDepan()+" "+vo.getPasien().getNamaBelakang()); - Map result=registrasiPasienService.saveRegistrasiPasien(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-registrasi-pasien-penunjang", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPasienPenunjang(@Valid @RequestBody RegistrasiPasienPenunjangVO vo,HttpServletRequest request) { - try { - Map result = registrasiPelayananService.savePasienDaftarPenunjang(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 DataAsuransiService dataAsuransiService; - @RequestMapping(value = "/save-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDataAsuransi(@Valid @RequestBody DataAsuransiVO vo,HttpServletRequest request) { - try { - Map result=dataAsuransiService.saveDataAsuransi(vo); + private RegistrasiPasienRawatInapService registrasiPasienInapJalanService; + + @RequestMapping(value = "/save-registrasi-pasien", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRegistrasiPasien(@Valid @RequestBody RegistrasiPasienVO vo, + HttpServletRequest request) { + try { + if (vo.getPasien().getNamaDepan() != null) + vo.getPasien().setNamaPasien(vo.getPasien().getNamaDepan() + " " + vo.getPasien().getNamaBelakang()); + Map result = registrasiPasienService.saveRegistrasiPasien(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 saveRegistrasiPasien", 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 saveRegistrasiPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - + + @RequestMapping(value = "/save-registrasi-pasien-penunjang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRegistrasiPasienPenunjang( + @Valid @RequestBody RegistrasiPasienPenunjangVO vo, HttpServletRequest request) { + try { + Map result = registrasiPelayananService.savePasienDaftarPenunjang(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 savePasienDaftarPenunjang", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when savePasienDaftarPenunjang", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-gawat-darurat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/antrian-pasien-gawat-darurat/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getAllNewVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @@ -138,127 +109,82 @@ public class RegistrasiPasienController extends LocaleController resultPageMap = hasilTriaseService.findHasilTriase(page, limit, sort, dir, dateStart, dateEnd); - List data=(List) resultPageMap.get("hasilTriase"); - Mapresult=new HashMap(); + Map resultPageMap = hasilTriaseService.findHasilTriase(page, limit, sort, dir, dateStart, + dateEnd); + List data = (List) resultPageMap.get("hasilTriase"); + Map result = new HashMap<>(); result.put("data", data); return result; } - + @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-one-antrian-pasien-gawat-darurat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-one-antrian-pasien-gawat-darurat/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getOneVOWithQueryString(@RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = hasilTriaseService.findHasilTriase(noRec); - List data=(List) resultPageMap.get("hasilTriase"); - Mapresult=new HashMap(); + List data = (List) resultPageMap.get("hasilTriase"); + Map result = new HashMap<>(); result.put("data", data); return result; } - - //--------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - - @Autowired - private RegistrasiPasienRawatInapService registrasiPasienInapJalanService; - - @RequestMapping(value = "/save-registrasi-pasien-bayi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> registrasiPasien(@Valid @RequestBody PasienVO vo, HttpServletRequest request) { - try { - Map result = registrasiPasienInapJalanService.registrasiPasien(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + @RequestMapping(value = "/save-registrasi-pasien-bayi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> registrasiPasien(@Valid @RequestBody PasienVO vo, + HttpServletRequest request) { + try { + Map result = registrasiPasienInapJalanService.registrasiPasien(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveRegistrasiPasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when registrasiPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveRegistrasiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when registrasiPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/save-pasien-daftar-bayi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePasienDaftar(@Valid @RequestBody PasienDaftarVO vo, HttpServletRequest request) { - try { - Map result = registrasiPasienInapJalanService.registrasiRekamMedisPasien(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 savePasienDaftar", 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 savePasienDaftar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-pasien-by-nocm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPasienByNocm( - @RequestParam(value = "noCm", required = true) String noCm, HttpServletRequest request) { + @RequestMapping(value = "/get-pasien-by-nocm", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPasienByNocm(@RequestParam(value = "noCm") String noCm, + HttpServletRequest request) { try { Map result = registrasiPelayananService.getDataPasien(noCm); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + 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 getPasienByNocm", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getDataPasien", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPasienByNocm", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getDataPasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-pasien-daftar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updatePasienDaftar(@Valid @RequestBody PasienVO vo,HttpServletRequest request) { - try { - Map result = registrasiPelayananService.updatePasienDaftar(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + @RequestMapping(value = "/update-pasien-daftar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> updatePasienDaftar(@Valid @RequestBody PasienVO vo, + HttpServletRequest request) { + try { + Map result = registrasiPelayananService.updatePasienDaftar(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when updatePasienDaftar", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updatePasienDaftar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when updatePasienDaftar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - - @RequestMapping(value = "/get-umur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity getUmur( - @RequestParam("tglLahir") String tglLahir,HttpServletRequest request){ - try { - String result = reportingPelayananRekamMedisService.getUmur(tglLahir); - 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 getUmur ", 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 getUmur", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updatePasienDaftar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java index dc2bf88d..3191340e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java @@ -1,33 +1,31 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dao.HasilTriaseDao; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RegistrasiPasienGawatDaruratService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import 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; /** * Controller class for Registrasi Pasien Business @@ -36,77 +34,63 @@ import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO; */ @RestController @RequestMapping("/registrasi-pasien-gawat-darurat") -@JsonIgnoreProperties(ignoreUnknown = true) +@JsonIgnoreProperties(ignoreUnknown = true) public class RegistrasiPasienGawatDaruratController extends LocaleController { + private static final Logger LOGGER = getLogger(RegistrasiPasienGawatDaruratController.class); + @Autowired private RegistrasiPasienGawatDaruratService registrasiPasienGawatDarurat; + @Autowired private HasilTriaseDao hasilTriaseDao; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RegistrasiPasienGawatDaruratController.class); - - @RequestMapping(value = "/save-registrasi-pasien-gawat-darurat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePasienFromRegistrasiPasienGawatDarurat(@Valid @RequestBody RegistrasiPasienGawatDaruratVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-registrasi-pasien-gawat-darurat", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePasienFromRegistrasiPasienGawatDarurat( + @Valid @RequestBody RegistrasiPasienGawatDaruratVO vo, HttpServletRequest request) { try { - Map result=registrasiPasienGawatDarurat.savePasienFromRegistrasiPasienGawatDarurat(vo); + Map result = registrasiPasienGawatDarurat.savePasienFromRegistrasiPasienGawatDarurat(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 savePasienFromRegistrasiPasienGawatDarurat", 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 savePasienFromRegistrasiPasienGawatDarurat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/save-registrasi-pasien", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePasienFromRegistrasi(@Valid @RequestBody RegistrasiPasienGawatDaruratVO vo,HttpServletRequest request) { + + @RequestMapping(value = "/save-registrasi-pasien", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePasienFromRegistrasi( + @Valid @RequestBody RegistrasiPasienGawatDaruratVO vo, HttpServletRequest request) { try { - Map result=registrasiPasienGawatDarurat.savePasien(vo); + Map result = registrasiPasienGawatDarurat.savePasien(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 savePasien", 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 savePasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-hasil-triage/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-hasil-triage/", method = GET, produces = APPLICATION_JSON_VALUE) public Map getAllNewVOWithQueryString( - @RequestParam(value = "noRec", required = false, defaultValue = "noRec") String noRec) - { - - Map result=null; - try { - result = hasilTriaseDao.findOne(noRec).ToMap(); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - - return result; - - - + @RequestParam(value = "noRec", required = false, defaultValue = "noRec") String noRec) { + try { + return hasilTriaseDao.findOne(noRec).ToMap(); + } catch (IllegalArgumentException | IllegalAccessException e) { + throw new ServiceVOException(e.getMessage()); + } } - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java index a5ea1524..64340628 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java @@ -1,35 +1,35 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; +import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; -import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO; +import com.jasamedika.medifirst2000.vo.PasienVO; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.Collection; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; /** * Controller class for Registrasi Pasien Business @@ -38,120 +38,97 @@ import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO; */ @RestController @RequestMapping("/registrasi-pasien-online") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RegistrasiPasienOnlineController extends LocaleController implements IBaseRestController { +@JsonIgnoreProperties(ignoreUnknown = true) +public class RegistrasiPasienOnlineController extends LocaleController { + + private static final Logger LOGGER = getLogger(RegistrasiPasienOnlineController.class); @Autowired - private RegistrasiPasienOnlineService registrasiPasienOnlineService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(RegistrasiPasienOnlineController.class); - - @RequestMapping(value = "/get-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPasien(@RequestParam(value = "id", required = false)String id) { + private RegistrasiPasienOnlineService registrasiPasienOnlineService; + + @RequestMapping(value = "/get-pasien", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPasien(@RequestParam(value = "id", required = false) String id) { try { - Map result=registrasiPasienOnlineService.getPasienByNoRec(id); - - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - + Map result = registrasiPasienOnlineService.getPasienByNoRec(id); + 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 getPasienByNoRec", 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 getPasienByNoRec", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - @RequestMapping(value = "/save-registrasi-pasien-online", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPasienOnline( - //@Valid @RequestBody AntrianPasienRegistrasiVO vo, - HttpServletRequest request) { - try { - //add by askur 04102016 - //if(vo.getPasien().getNamaDepan()!=null) - // vo.getPasien().setNamaPasien(vo.getPasien().getNamaDepan()); - // - AntrianPasienRegistrasiVO vo = (AntrianPasienRegistrasiVO) this.getItem2(request, new AntrianPasienRegistrasiVO()); - - Map result=registrasiPasienOnlineService.saveRegistrasiPasienOnline(vo); - - if (null != result) - { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - BroadcastMessage("DaftarAntrianPerjanjian",result.get("noReservasi").toString()); - } - 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 = "/confirm-registrasi-online/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> confirmRegistrasiPelayananPasien(@RequestParam(value = "noReservasi", required = false) String noReservasi,HttpServletRequest request) { - + @RequestMapping(value = "/save-registrasi-pasien-online", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRegistrasiPasienOnline(HttpServletRequest request) { try { - Map resultPageMap = registrasiPasienOnlineService.confirmRegistrasiPasienOnline(noReservasi); - if(CommonUtil.isNotNullOrEmpty(resultPageMap)) - { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - BroadcastMessage("DaftarAntrian",""); + AntrianPasienRegistrasiVO vo = (AntrianPasienRegistrasiVO) this.getItem2(request, + new AntrianPasienRegistrasiVO()); + Map result = registrasiPasienOnlineService.saveRegistrasiPasienOnline(vo); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrianPerjanjian", result.get("noReservasi").toString()); } - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK,mapHeaderMessage); - + return getJsonResponse(result, CREATED, 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 saveRegistrasiPasienOnline", 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 saveRegistrasiPasienOnline", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/confirm-pendaftaran/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> confirmPendaftaran(@RequestParam(value = "noReservasi", required = false) String noReservasi,HttpServletRequest request) { - + @RequestMapping(value = "/confirm-registrasi-online/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> confirmRegistrasiPelayananPasien( + @RequestParam(value = "noReservasi", required = false) String noReservasi, HttpServletRequest request) { + try { + Map resultPageMap = registrasiPasienOnlineService + .confirmRegistrasiPasienOnline(noReservasi); + if (CommonUtil.isNotNullOrEmpty(resultPageMap)) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrian", ""); + } + return getJsonResponse(resultPageMap, OK, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when confirmRegistrasiPasienOnline", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when confirmRegistrasiPasienOnline", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/confirm-pendaftaran/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> confirmPendaftaran( + @RequestParam(value = "noReservasi", required = false) String noReservasi, HttpServletRequest request) { try { Map resultPageMap = registrasiPasienOnlineService.confirmPendaftaran(noReservasi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - BroadcastMessage("DaftarAntrian",""); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK,mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrian", ""); + return getJsonResponse(resultPageMap, 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 confirmPendaftaran", 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 confirmPendaftaran", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list/", method = RequestMethod.GET, produces = 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, + + @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 = "10") 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, @@ -159,73 +136,9 @@ public class RegistrasiPasienOnlineController extends LocaleController resultPageMap = registrasiPasienOnlineService.findAllAntrianPaging(page, limit, sort, dir,ruanganId,dateStart,dateEnd,namaPasien,noReservasi); - + Map resultPageMap = registrasiPasienOnlineService.findAllAntrianPaging(page, limit, sort, dir, + ruanganId, dateStart, dateEnd, namaPasien, noReservasi); return constructListPageResult(resultPageMap); } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/proses-antrian-ke-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> prosesAntrianToPasien(@RequestParam(value = "noReservasi", required = false) String noReservasi,HttpServletRequest request) { - - try { - Map resultPageMap = registrasiPasienOnlineService.savePasienAndPasienDaftar(noReservasi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(resultPageMap, 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); - } - - - } - - - @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(AntrianPasienRegistrasiVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(AntrianPasienRegistrasiVO 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/RegistrasiPasienSmsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java deleted file mode 100644 index f205c81e..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RegistrasiSmsService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiSmsVO; - -/** - * Controller class for Registrasi Pasien Business - * - * @author adik - */ -@RestController -@RequestMapping("/registrasi-pasien-sms") -@JsonIgnoreProperties(ignoreUnknown = true) -public class RegistrasiPasienSmsController extends LocaleController - implements IBaseRestController { - @Autowired - private RegistrasiSmsService registrasiSmsService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPasienSmsController.class); - - @RequestMapping(value = "/save-registrasi-sms/", method = RequestMethod.POST) - public ResponseEntity> saveRegistrasiSms( - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "kodeRuangan", required = true) String kodeRuangan, - @RequestParam(value = "kodeDokter", required = true) short kodeDokter, - @RequestParam(value = "kodeRegulerEkslusif", required = true) Integer kodeRegulerEkslusif, - @RequestParam(value = "tanggal", required = true) String tanggal, HttpServletRequest request) { - - try { - RegistrasiSmsVO vo = new RegistrasiSmsVO(); - vo.setNoCm(noCm); - vo.setKodeRuangan(kodeRuangan); - vo.setKodeDokter(kodeDokter); - vo.setKodeRegulerEkslusif(kodeRegulerEkslusif); - vo.setTanggal(DateUtil.toDate(tanggal)); - Map result = registrasiSmsService.saveRegistrasiPasienSms(vo); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, 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 = "/sms_gateway_kemenkes/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiSms( - @RequestParam(value = "msisdn", required = true) String msisdns, - @RequestParam(value = "trx_id", required = true) String trx_id, - @RequestParam(value = "sms", required = true) String sms, HttpServletRequest request) { - - String[] rs = sms.split("_"); - // rs[0] --> "WALL+RS" - // rs[1] --> "DAFTAR" - // rs[2] --> kode rs - // rs[3] --> kode poli - // rs[4] --> kode dokter - // rs[5] --> kode cara bayar - // rs[6] --> kode no rm - // rs[7] --> kode tgl lahir - // rs[8] --> kode tgl daftar - - try { - RegistrasiSmsVO vo = new RegistrasiSmsVO(); - vo.setNoCm(rs[6]); - vo.setKodeRuangan(rs[3]); - - String tgllahir = rs[7]; - String tgldaftar = rs[8]; - String kdDokter = rs[4]; - Map result = registrasiSmsService.saveRegistrasiPasienSmsKemenkes(vo, tgllahir, tgldaftar, - kdDokter); - Integer stats = new Integer((Integer) result.get("status")); - if (stats > 0) { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, 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-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> zzgetRuangan(HttpServletRequest request) { - try { - Map result = registrasiSmsService.findAllRuangan(); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, 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-dokter/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDokter( - @RequestParam(value = "kodeRuangan", required = true) Integer kodeRuangan, - @RequestParam(value = "tanggal", required = true) String tanggal, HttpServletRequest request) { - try { - Map result = registrasiSmsService.findAllDokter(kodeRuangan, DateUtil.toDate(tanggal)); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, 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-all-dokter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDokterRuangan(HttpServletRequest request) { - try { - Map result = registrasiSmsService.findAllDokter(); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, 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); - } - } - - @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(AntrianPasienRegistrasiVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(AntrianPasienRegistrasiVO 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/RegistrasiPelayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java index 9a67ab55..6d5b54a2 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java @@ -6,16 +6,13 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.KelompokPasienConverter; import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dao.*; -import com.jasamedika.medifirst2000.dto.Antrian; -import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto; -import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto; +import com.jasamedika.medifirst2000.dto.*; import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.enums.TipePasienEnum; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; @@ -24,7 +21,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.net.URLDecoder; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -37,6 +33,7 @@ import static com.jasamedika.medifirst2000.util.DateUtil.toDate; 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; @@ -50,7 +47,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; @RequestMapping("/registrasi-pelayanan") public class RegistrasiPelayananController extends LocaleController { - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); + private static final Logger LOGGER = getLogger(RegistrasiPelayananController.class); @Autowired private KendaliDokumenRekamMedisService kendaliDokumenRekamMedisService; @@ -922,32 +919,6 @@ public class RegistrasiPelayananController extends LocaleController> getAllRuanganPenunjang(HttpServletRequest request) { - try { - List listRuanganVO = ruanganService - .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiLaboratorium"); - List listRuanganTemp = new ArrayList<>(listRuanganVO); - listRuanganVO = ruanganService.findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRadiologi"); - listRuanganTemp.addAll(listRuanganVO); - mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return getJsonResponse(listRuanganTemp, OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error( - "Got ServiceVOException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiLaboratorium,KdDepartemenInstalasiRadiologi]", - e.getMessage()); - addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error( - "Got JpaSystemException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiLaboratorium,KdDepartemenInstalasiRadiologi]", - jse.getMessage()); - addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttpStatus(CONFLICT, mapHeaderMessage); - } - - } - @RequestMapping(value = "/antrian-pasien-list-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllRadiologiVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @@ -1127,42 +1098,6 @@ public class RegistrasiPelayananController extends LocaleController> getSearchAllRuangan( - @RequestParam(value = "namaRuangan", required = false) String namaRuangan, HttpServletRequest request) { - try { - List listRuanganVO = ruanganService.findRuanganByDepartemenByName(namaRuangan); - mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return getJsonResponse(listRuanganVO, OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemenByName", e.getMessage()); - addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemenByName", jse.getMessage()); - addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttpStatus(CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/search-get-all-ruangan-rehab-medik", method = GET) - public ResponseEntity> getSearchAllRuanganRehabMedik( - @RequestParam(value = "namaRuangan", required = false) String namaRuangan, HttpServletRequest request) { - try { - List listRuanganVO = ruanganService.findRuanganRehamMedik(); - mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return getJsonResponse(listRuanganVO, OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when findRuanganRehamMedik", e.getMessage()); - addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when findRuanganRehamMedik", jse.getMessage()); - addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttpStatus(CONFLICT, mapHeaderMessage); - } - } - @RequestMapping("/kartuPasien") public ModelAndView generateKartuPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "id") Integer id) { @@ -1208,7 +1143,7 @@ public class RegistrasiPelayananController extends LocaleController list = registrasiPelayananPasienService.findAntrian(noRec); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Slip Antrian"); @@ -1222,7 +1157,7 @@ public class RegistrasiPelayananController extends LocaleController list = persetujuanUmumService.findEtiket(noCm, tglRegistrasi); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Etiket"); @@ -1236,8 +1171,7 @@ public class RegistrasiPelayananController extends LocaleController list = antrianPasienDiperiksaService.findAntrian(noRec); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Antrian Pasien Diperiksa"); @@ -1247,8 +1181,6 @@ public class RegistrasiPelayananController extends LocaleController> getKelompokPasien(HttpServletRequest request) { try { @@ -1310,7 +1241,6 @@ public class RegistrasiPelayananController extends LocaleController> getAllAntrianPasienPulangList( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @@ -1588,28 +1518,6 @@ public class RegistrasiPelayananController extends LocaleController> getOrderPelayananGizi( - @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate, - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) { - try { - Map result = orderProdukService.getOrderPelayananGizi(); - if (null != result) - mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan", request); - return getJsonResponse(result, CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getOrderPelayananGizi", e.getMessage()); - addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getOrderPelayananGizi", jse.getMessage()); - addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttpStatus(CONFLICT, mapHeaderMessage); - } - } - @RequestMapping(value = "/get-order-pelayanan-gizi-minuman/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananGiziMinuman( @RequestParam(value = "startDate", required = false) String startDate, @@ -2279,22 +2187,9 @@ public class RegistrasiPelayananController extends LocaleController> findObatProduk( @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, HttpServletRequest request) { - String data = request.getQueryString(); - data = URLDecoder.decode(data); - StringBuilder criteria = new StringBuilder(); - StringBuilder values = new StringBuilder(); - String[] arrQueries = data.split("&"); - for (String query : arrQueries) { - if (query.contains("filter[filters][0][filter][field]")) { - criteria.append(query.replace("filter[filters][0][filter][field]=", "")); - } else if (query.contains("filter[filters][0][value]")) { - values.append(query.replace("filter[filters][0][value]=", "")); - } - } List resultPageMap = registrasiPelayananService.findDiagnosaByKode(kodeDiagnosa); return getJsonResponse(resultPageMap, OK); } @@ -2422,29 +2317,4 @@ public class RegistrasiPelayananController extends LocaleController> saveAkomodasi( - @RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar, - HttpServletRequest request) { - try { - Map result = registrasiPelayananService.trigerringSaveAkomodasi(noRecPasienDaftar); - 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", result.get("statusPasien").toString()); - return getJsonResponse(result, CREATED, headerMessageCustom); - } - } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when trigerringSaveAkomodasi", e.getMessage()); - addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when trigerringSaveAkomodasi", jse.getMessage()); - addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttpStatus(CONFLICT, mapHeaderMessage); - } - } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java deleted file mode 100644 index eb5dc7e6..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java +++ /dev/null @@ -1,133 +0,0 @@ - -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PemeriksaanSelanjutnyaVO; -import com.jasamedika.medifirst2000.vo.RegPelayananPasienVO; - -/** - * Controller class for Registrasi Pasien Business - * - * @author Askur - */ -@RestController -@RequestMapping("/registrasi-pelayanan-pasien") -public class RegistrasiPelayananPasienController extends LocaleController implements IBaseRestController { - - - - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananPasienController.class); - - - @RequestMapping(value = "/save-pemeriksaan-selanjutnya", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPelayananPasien(@Valid @RequestBody RegPelayananPasienVO vo,HttpServletRequest request) { - try { - Map result = registrasiPelayananPasienService.createRegistrasiPelayananPasien(vo.getNoRegistrasi(), null); - - 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 = "/update-pemeriksaan-selanjutnya", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateRegistrasiPelayananPasien(@Valid @RequestBody PemeriksaanSelanjutnyaVO vo,HttpServletRequest request) { - try { - Map result = registrasiPelayananPasienService.updateRegistrasiPelayananPasien(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); - } - - } - - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - - @Override - public ResponseEntity addVO(PemeriksaanSelanjutnyaVO vo) { - return null; - } - - - @Override - public ResponseEntity editVO(PemeriksaanSelanjutnyaVO vo) { - return null; - } - - - @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; - } - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java deleted file mode 100644 index 7eb15a10..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananRawatInapService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananRawatInapVO; - -/** - * Controller class for Registrasi Pasien Business - * - * @author Askur - */ -@RestController -@RequestMapping("/registrasi-pelayanan-rawat-inap") -public class RegistrasiPelayananRawatInapController extends LocaleController implements - IBaseRestController { - - @Autowired - private RegistrasiPelayananRawatInapService registrasiPasienService; - - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananRawatInapController.class); - - - @RequestMapping(value = "/save-registrasi-pelayanan-rawat-inap", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPelayananRawatInapRawatInap(@Valid @RequestBody RegistrasiPelayananRawatInapVO vo,HttpServletRequest request) { - try { - Map result = registrasiPasienService.saveRegistrasiPelayananRawatInapRawatInap(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 Registrasi Pelayanan Rawat Inap", 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 Registrasi Pelayanan Rawat Inap", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - - - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - - - @Override - public ResponseEntity addVO(RegistrasiPelayananRawatInapVO vo) { - return null; - } - - - - @Override - public ResponseEntity editVO(RegistrasiPelayananRawatInapVO vo) { - return null; - } - - - - @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; - } - - -} 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 ebc505fb..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 @@ -1,179 +1,129 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.RehabilitasiAsesmenService; +import com.jasamedika.medifirst2000.service.RehabilitasiKlaimFormulirService; +import com.jasamedika.medifirst2000.vo.RehabilitasiAsesmenVO; +import com.jasamedika.medifirst2000.vo.RehabilitasiFormulirKlaimVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.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 javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/rehabilitasi-asesmen") -public class RehabilitasiAsesmenController extends LocaleController { - - private static final Logger LOGGER = LoggerFactory.getLogger(RehabilitasiAsesmenController.class); - +public class RehabilitasiAsesmenController extends LocaleController { + + private static final Logger LOGGER = getLogger(RehabilitasiAsesmenController.class); + @Autowired RehabilitasiAsesmenService rehabilitasiAsesmenService; - + @Autowired RehabilitasiKlaimFormulirService rehabilitasiKlaimFormulirService; - - @RequestMapping(value = "/save-rehabilitasi-asesmen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRehabilitasiAsesmen(@Valid @RequestBody RehabilitasiAsesmenVO vo, - HttpServletRequest request) throws ParseException { - try { + @RequestMapping(value = "/save-rehabilitasi-asesmen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRehabilitasiAsesmen(@Valid @RequestBody RehabilitasiAsesmenVO vo, + HttpServletRequest request) { + try { Map result = rehabilitasiAsesmenService.saveRehabilitasiAsesmen(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 ServiceVOException {} when saveRehabilitasiAsesmen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveRehabilitasiAsesmen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, 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-rehabilitasi-asesmen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getRehabilitasiAsesmen( - @RequestParam(value = "norec", required = true) String norec, HttpServletRequest request) { + @RequestMapping(value = "/get-list-rehabilitasi-asesmen", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getListRehabilitasiAsesmen( + @RequestParam(value = "norec") String norec, HttpServletRequest request) { try { - Map result = rehabilitasiAsesmenService.getRehabilitasiAsesmen(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); + List> result = rehabilitasiAsesmenService.getListRehabilitasiAsesmen(norec); + 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 getKalkulasiDataRemunerasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListRehabilitasiAsesmen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListRehabilitasiAsesmen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-list-rehabilitasi-asesmen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListRehabilitasiAsesmen( - @RequestParam(value = "norec", required = true) String norec, HttpServletRequest request) { - try { - List> result = rehabilitasiAsesmenService.getListRehabilitasiAsesmen(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 getKalkulasiDataRemunerasi", 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 getKalkulasiDataRemunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-rehabilitasi-formulir-klaim", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-rehabilitasi-formulir-klaim", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveFormulirKlaim(@Valid @RequestBody RehabilitasiFormulirKlaimVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map result = rehabilitasiKlaimFormulirService.saveRehabilitasiKlaimFormulir(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 ServiceVOException {} when saveRehabilitasiKlaimFormulir", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveRehabilitasiKlaimFormulir", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, 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-rehabilitasi-formulir-klaim", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getRehabilitasiFormulirKlaim( - @RequestParam(value = "norec", required = true) String norec, HttpServletRequest request) { + @RequestMapping(value = "/get-list-rehabilitasi-formulir-klaim", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getListRehabilitasiFormulirKlaim( + @RequestParam(value = "norec") String norec, HttpServletRequest request) { try { - Map result = rehabilitasiKlaimFormulirService.getRehabilitasiKlaimFormulir(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); + List> result = rehabilitasiKlaimFormulirService.getListRehabilitasiKlaimFormulir(norec); + 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 getKalkulasiDataRemunerasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListRehabilitasiKlaimFormulir", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-list-rehabilitasi-formulir-klaim", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListRehabilitasiFormulirKlaim( - @RequestParam(value = "norec", required = true) String norec, HttpServletRequest request) { - try { - List> result = rehabilitasiKlaimFormulirService.getListRehabilitasiKlaimFormulir(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 getKalkulasiDataRemunerasi", 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 getKalkulasiDataRemunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListRehabilitasiKlaimFormulir", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } 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 f7c7ffd9..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 @@ -1,94 +1,49 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.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; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController -@RequestMapping(value="/struk-histori") +@RequestMapping(value = "/struk-histori") public class RekapGajiPegawaiController extends LocaleController { - + @Autowired private StrukHistoriService strukHistoriService; - - @RequestMapping(value="/import-gaji-pns", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> importFileGaji(@RequestBody StrukHistoriVO vo, HttpServletRequest request) { + + @RequestMapping(value = "/import-gaji-pns", method = POST, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> importFileGaji(@RequestBody StrukHistoriVO vo, + HttpServletRequest request) { Map result = strukHistoriService.save(vo); if (result != null) { if (!result.isEmpty()) { - 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 { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - } - - @RequestMapping(value="/gaji-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> gajiPegawai(@RequestParam("idKategoryPegawai") Integer idKategoryPegawai, - HttpServletRequest request) { - List> result = strukHistoriService.findPegawaiGajiSK(idKategoryPegawai); - 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="/gaji-pegawai", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveGajiPegawai(@RequestBody StrukHistoriVO vo, HttpServletRequest request) { - - Map result = strukHistoriService.saveGajiPegawai(vo); - if (result != null) { - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - if (!result.get("StrukHistori.ErrorMessage").toString().isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "StrukHistory is not created"); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data"); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - - } - } else { - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - - @RequestMapping(value="/uang-makan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> hitungUangMakanPegawai(HttpServletRequest request) { - Map result = strukHistoriService.findUangMakan(); - 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); - } - + }