diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java deleted file mode 100644 index ff787196..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java +++ /dev/null @@ -1,115 +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.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.UnitOrgService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.UnitOrgVO; - -@RestController -@RequestMapping("/unit-org") -public class UnitOrgController extends LocaleController{ - - @Autowired - private UnitOrgService unitOrgservice; - - private static final Logger LOGGER = LoggerFactory - .getLogger(UnitOrgController.class); - - @RequestMapping(value = "/save-unit-org", - method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveUnitOrg(@Valid @RequestBody UnitOrgVO vo, HttpServletRequest request) { - try { - Map result = unitOrgservice.saveUnitOrg(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 saveUnitOrg", 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 saveUnitOrg", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/find-all-unit-org", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findAllUnitOrg(HttpServletRequest request) { - Map result=null; - try { - result = unitOrgservice.findAllUnitOrg(); - 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); - } - - @RequestMapping(value = "/find-by-kode-unit-org", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByKodeUnitOrg - (@RequestParam(value = "kodeUnitOrg", required = true) String kodeUnitOrg, HttpServletRequest request) { - Map result=null; - try { - result = unitOrgservice.findByKodeUnitOrg(kodeUnitOrg); - 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); - } - - @RequestMapping(value = "/find-one-unit-org", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findOneUnitOrg(HttpServletRequest request) { - Map result=null; - try { - result = unitOrgservice.findOneUnitOrg(); - 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/UploadDownloadmageController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java index d4bf78d8..ceb5eacf 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java @@ -1,78 +1,81 @@ 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.UploadDownloadImageService; +import com.jasamedika.medifirst2000.vo.UploadImageVO; 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.UploadDownloadImageService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.UploadImageVO; +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("/image") -public class UploadDownloadmageController extends LocaleController{ +public class UploadDownloadmageController extends LocaleController { + + private static final Logger LOGGER = getLogger(UploadDownloadmageController.class); @Autowired private UploadDownloadImageService service; - - private static final Logger LOGGER = LoggerFactory - .getLogger(UploadDownloadmageController.class); - - @RequestMapping(value = "/upload", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> upload(@Valid @RequestBody UploadImageVO vo, HttpServletRequest request) { - try { - Map result = service.uploadImage(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + @RequestMapping(value = "/upload", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> upload(@Valid @RequestBody UploadImageVO vo, + HttpServletRequest request) { + try { + Map result = service.uploadImage(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 upload", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when uploadImage", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when upload", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when uploadImage", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/download", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> download( - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, HttpServletRequest request) { + + @RequestMapping(value = "/download", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> download(@RequestParam(value = "noRegistrasi") String noRegistrasi, + HttpServletRequest request) { try { - Map result = service.download(noRegistrasi); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = service.download(noRegistrasi); + 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 download", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when download", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when download", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when download", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java index 178f45da..5e1507ce 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java @@ -1,75 +1,66 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.UskomPemeriksaanService; +import com.jasamedika.medifirst2000.vo.UskomPemeriksaanVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.util.Map; -import org.json.JSONException; -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.UskomPemeriksaanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.UskomPemeriksaanVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/uskom") -public class UskomPemeriksaanController extends LocaleController { +public class UskomPemeriksaanController extends LocaleController { + + private static final Logger LOGGER = getLogger(UskomPemeriksaanController.class); @Autowired private UskomPemeriksaanService service; - private static final Logger LOGGER = LoggerFactory.getLogger(UskomPemeriksaanController.class); - - @SuppressWarnings("unchecked") @RequestMapping(value = "/load-data") @ResponseBody - public Map loadData( - @RequestParam(value = "noRec", required = false) String noRec) throws JSONException { + public Map loadData(@RequestParam(value = "noRec", required = false) String noRec) { return service.loadData(noRec); } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/get-nilai-normal") @ResponseBody - public Map getMaster( - @RequestParam(value = "noRec", required = false) String noRec) throws JSONException { + public Map getMaster(@RequestParam(value = "noRec", required = false) String noRec) { return service.getDataMaster(noRec); } - - @RequestMapping(value = "/save-pemeriksaan-uskom", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePemeriksaanUskom(@Valid @RequestBody UskomPemeriksaanVO vo, HttpServletRequest request) { - try { - Map result = service.savePemeriksaanUskom(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-pemeriksaan-uskom", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePemeriksaanUskom(@Valid @RequestBody UskomPemeriksaanVO vo, + HttpServletRequest request) { + try { + Map result = service.savePemeriksaanUskom(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 saveUskom", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemeriksaanUskom", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveUskom", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemeriksaanUskom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java index 4af6c65c..62d17e25 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java @@ -1,32 +1,33 @@ package com.jasamedika.medifirst2000.controller; -import java.util.HashMap; -import java.util.List; -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.UsulanEvaluasiService; +import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO; 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.UsulanEvaluasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO; +import javax.servlet.http.HttpServletRequest; +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; /** * class Usulan Evaluasi Controller @@ -36,145 +37,95 @@ import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO; @RestController @RequestMapping("/usulan-evaluasi") -public class UsulanEvaluasiController extends LocaleController{ - private static final Logger LOGGER = LoggerFactory.getLogger(UsulanEvaluasiController.class); - +public class UsulanEvaluasiController extends LocaleController { + + private static final Logger LOGGER = getLogger(UsulanEvaluasiController.class); + @Autowired private UsulanEvaluasiService usulanEvaluasiService; - - @RequestMapping( value = "/save-rencana-penyuluhan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity saveRencanaPenyuluhan( - @RequestBody UsulanEvaluasiVO vo, HttpServletRequest request) { - + + @RequestMapping(value = "/save-rencana-penyuluhan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity saveRencanaPenyuluhan(@RequestBody UsulanEvaluasiVO vo, HttpServletRequest request) { try { String result = usulanEvaluasiService.saveUsulanEvaluasiDanKahianOrganisasi(vo); - if (result != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - - LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when saveUsulanEvaluasiDanKahianOrganisasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - - LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } + LOGGER.error("Got JpaSystemException {} when saveUsulanEvaluasiDanKahianOrganisasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } } - @RequestMapping(value = "/get-no-usulan/", method = RequestMethod.GET) - public ResponseEntity> getNoUsulanEvaluasi(HttpServletRequest request) { - + + @RequestMapping(value = "/get-no-usulan/", method = GET) + public ResponseEntity> getNoUsulanEvaluasi(HttpServletRequest request) { try { - String noSurat= usulanEvaluasiService.noUsulanDanKajianOrganisasi(); - Map result=new HashMap(); + String noSurat = usulanEvaluasiService.noUsulanDanKajianOrganisasi(); + Map result = new HashMap<>(); result.put("noSurat", noSurat); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add nota-dinas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when noUsulanDanKajianOrganisasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when noUsulanDanKajianOrganisasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-evaluasi-by-ruangan-tujuan", method = RequestMethod.GET) - public ResponseEntity>> getListUsulanEvaluasiByRuanganTujuan( + + @RequestMapping(value = "/get-list-evaluasi-by-ruangan-pembuat", method = GET) + public ResponseEntity>> getListUsulanEvaluasiByRuanganPembuat( @RequestParam(value = "noUsulan", required = false) String noUsulan, - @RequestParam(value = "tglAwal", required = true)String tglAwal, - @RequestParam(value = "tglAkhir", required = true)String tglAkhir, - @RequestParam(value = "idPegawai", required = false)Integer idPegawai, - HttpServletRequest request) { - + @RequestParam(value = "tglAwal") String tglAwal, @RequestParam(value = "tglAkhir") String tglAkhir, + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { - List> noSurat= usulanEvaluasiService.listUsulanEvaluasiByRuanganTujuan(tglAwal, tglAkhir,noUsulan,idPegawai); - - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(noSurat, HttpStatus.OK,mapHeaderMessage); + List> noSurat = usulanEvaluasiService.listUsulanEvaluasiByRuanganPembuat(tglAwal, + tglAkhir, noUsulan, ruanganId); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(noSurat, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add nota-dinas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when listUsulanEvaluasiByRuanganPembuat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when listUsulanEvaluasiByRuanganPembuat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-evaluasi-by-ruangan-pembuat", method = RequestMethod.GET) - public ResponseEntity>> getListUsulanEvaluasiByRuanganPembuat( - @RequestParam(value = "noUsulan", required = false) String noUsulan, - @RequestParam(value = "tglAwal", required = true)String tglAwal, - @RequestParam(value = "tglAkhir", required = true)String tglAkhir, - @RequestParam(value = "ruanganId", required = true)Integer ruanganId, + + @RequestMapping(value = "/get-usulan-evaluasi-by-nousulan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getUsulanEvaluasiByNoUsulan( + @RequestParam(value = "noUsulan") String noUsulan) { + Map resultPageMap = usulanEvaluasiService.usulanEvaluasiByNoUsulan(noUsulan); + return getJsonResponse(resultPageMap, OK, mapHeaderMessage); + } + + @RequestMapping(value = "/save-rekomendasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRekomendasi(@RequestBody UsulanEvaluasiVO vo, HttpServletRequest request) { - try { - List> noSurat= usulanEvaluasiService.listUsulanEvaluasiByRuanganPembuat(tglAwal, tglAkhir, noUsulan, ruanganId); - - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(noSurat, HttpStatus.OK,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add nota-dinas", 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 nota-dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - @RequestMapping(value = "/get-usulan-evaluasi-by-nousulan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getUsulanEvaluasiByNoUsulan( - @RequestParam(value = "noUsulan", required = true) String noUsulan) { - Map resultPageMap = usulanEvaluasiService.usulanEvaluasiByNoUsulan(noUsulan); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage); - } - @RequestMapping( value = "/save-rekomendasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRekomendasi( - @RequestBody UsulanEvaluasiVO vo, HttpServletRequest request) { - - try { - Map result = usulanEvaluasiService.saveRekomendasiUsulanEvaluasi(vo); - + Map result = usulanEvaluasiService.saveRekomendasiUsulanEvaluasi(vo); if (result != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - - LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when saveRekomendasiUsulanEvaluasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - - LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } + LOGGER.error("Got JpaSystemException {} when saveRekomendasiUsulanEvaluasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/VaksinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/VaksinController.java deleted file mode 100644 index c45a7619..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/VaksinController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.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.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.service.VaksinService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.GeneralCheckUpVO; -import com.jasamedika.medifirst2000.vo.VaksinVO; - -@RestController -@RequestMapping("/vaksin") -@JsonIgnoreProperties(ignoreUnknown = true) -public class VaksinController extends LocaleController implements -IBaseRestController{ - private static final Logger LOGGER = LoggerFactory.getLogger(GeneralCheckUpController.class); - - @Autowired - private VaksinService vaksinService; - - @RequestMapping(value = "/find-by-pegawai-id/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByPegawaiId(@RequestParam(value = "pegawaiId", required = false) Integer pegawaiId,HttpServletRequest request) { - Map result = vaksinService.findByPegawaiId(pegawaiId); - 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(VaksinVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(VaksinVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - -}