From 72e5251785cfa24e11f990226d4bc47e85d9d000 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 31 Dec 2024 14:14:44 +0700 Subject: [PATCH] Update controller Clean code --- .../PengukuranKebisinganController.java | 165 ++++--- .../PengukuranKelembabanController.java | 151 +++---- .../PengukuranKinerjaKegiatanController.java | 111 ----- .../PengukuranPencahayaanController.java | 153 +++---- .../controller/PengukuranSuhuController.java | 115 ++--- .../PenilaianKinerjaSatpamController.java | 58 ++- .../controller/PenyuluhanController.java | 425 +++++++----------- .../PenyusunanEPlanningController.java | 66 +-- .../PenyusunanTRPNBPController.java | 75 ++-- .../controller/PeralatanDetailController.java | 77 ---- .../controller/PeranController.java | 131 ++---- .../controller/PeranHubunganController.java | 118 ++--- .../PeriodePelaporanController.java | 130 ++---- 13 files changed, 591 insertions(+), 1184 deletions(-) delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeralatanDetailController.java diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java index f01c1e3b..8025b02a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java @@ -1,143 +1,140 @@ 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.PengukuranKebisinganService; +import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; 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 org.springframework.web.servlet.ModelAndView; -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.PengukuranKebisinganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; +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("/pengukuran-kebisingan") -public class PengukuranKebisinganController extends LocaleController{ - +public class PengukuranKebisinganController extends LocaleController { + + private static final Logger LOGGER = getLogger(PengukuranKebisinganController.class); + @Autowired private PengukuranKebisinganService service; - private static final Logger LOGGER = LoggerFactory.getLogger(PengukuranKebisinganController.class); - - @RequestMapping(value = "/get-unit-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-unit-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUnitRuangan(HttpServletRequest request) { try { - Map result = service.getUnitRuangan(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = service.getUnitRuangan(); + 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 getUnitRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getUnitRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getUnitRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-baku-mutu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-baku-mutu", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getBakuMutu(HttpServletRequest request) { try { - Map result = service.getBakuMutu(); - 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.getBakuMutu(); + 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 getBakuMutu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getBakuMutu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getBakuMutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getBakuMutu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/save-pengukuran-kebisingan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengukuranKebisingan(@Valid @RequestBody PengukuranKebisinganVO vo, HttpServletRequest request) { + + @RequestMapping(value = "/save-pengukuran-kebisingan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePengukuranKebisingan(@Valid @RequestBody PengukuranKebisinganVO vo, + HttpServletRequest request) { try { vo.setMenutype("kebisingan"); - Map result = service.savePengukuranKebisingan(vo); + Map result = service.savePengukuranKebisingan(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 savePengukuranKebisingan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengukuranKebisingan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePengukuranKebisingan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePengukuranKebisingan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pengukuran-kebisingan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-pengukuran-kebisingan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPengukuranKebisingan(HttpServletRequest request) { try { - Map result = service.getPengukuranKebisingan(); - 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.getPengukuranKebisingan(); + 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 getPengukuranKebisingan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPengukuranKebisingan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPengukuranKebisingan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - + @RequestMapping("/lapPengukuranKebisingan") public ModelAndView generateLapHasilPemeriksaanSWAPantauLimbahCair(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { - + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { Map result = this.service.getRepotingPengukurangKebisingan(startDate, endDate); - Map header = (Map) result.get("header"); String periode = header.get("startDate") == null ? "" : (String) header.get("startDate"); - periode = periode + (header.get("endDate") == null ? "" : " sd " + (String) header.get("endDate")); + periode = periode + (header.get("endDate") == null ? "" : " sd " + header.get("endDate")); m.addObject("dataSource", result.get("listData")); m.addObject("periode", periode); m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java index 17d89bcb..58e4329a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java @@ -1,143 +1,98 @@ 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.PengukuranKelembabanService; +import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; 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 org.springframework.web.servlet.ModelAndView; -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.PengukuranKelembabanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; +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("/pengukuran-kelembaban") -public class PengukuranKelembabanController extends LocaleController{ - +public class PengukuranKelembabanController extends LocaleController { + + private static final Logger LOGGER = getLogger(PengukuranKelembabanController.class); + @Autowired private PengukuranKelembabanService service; - private static final Logger LOGGER = LoggerFactory.getLogger(PengukuranKelembabanController.class); - - @RequestMapping(value = "/get-unit-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getUnitRuangan(HttpServletRequest request) { - try { - Map result = service.getUnitRuangan(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-baku-mutu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBakuMutu(HttpServletRequest request) { - try { - Map result = service.getBakuMutu(); - 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 getBakuMutu", 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 getBakuMutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-pengukuran-kelembaban", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengukuranKelembaban(@Valid @RequestBody PengukuranKebisinganVO vo, HttpServletRequest request) { + @RequestMapping(value = "/save-pengukuran-kelembaban", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePengukuranKelembaban(@Valid @RequestBody PengukuranKebisinganVO vo, + HttpServletRequest request) { try { vo.setMenutype("kelembaban"); - Map result = service.savePengukuranKelembaban(vo); + Map result = service.savePengukuranKelembaban(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 savePengukuranKelembaban", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengukuranKelembaban", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePengukuranKelembaban", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePengukuranKelembaban", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pengukuran-kelembaban", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-pengukuran-kelembaban", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPengukuranKelembaban(HttpServletRequest request) { try { - Map result = service.getPengukuranKelembaban(); - 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.getPengukuranKelembaban(); + 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 getPengukuranKebisingan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPengukuranKelembaban", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPengukuranKelembaban", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - + @RequestMapping("/lapPengukuranKelembaban") public ModelAndView lapPengukuranKelembaban(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { - + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { Map result = this.service.getRepotingPengukurangKelembaban(startDate, endDate); - Map header = (Map) result.get("header"); String periode = header.get("startDate") == null ? "" : (String) header.get("startDate"); - periode = periode + (header.get("endDate") == null ? "" : " sd " + (String) header.get("endDate")); + periode = periode + (header.get("endDate") == null ? "" : " sd " + header.get("endDate")); m.addObject("dataSource", result.get("listData")); m.addObject("periode", periode); m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java deleted file mode 100644 index b5d9a19e..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java +++ /dev/null @@ -1,111 +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.PengukuranKinerjaKegiatanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PengukuranKinerjaKegiatanVO; - -@RestController -@RequestMapping("/pengukuran-kinerja-kegiatan") -public class PengukuranKinerjaKegiatanController extends LocaleController { - - @Autowired - private PengukuranKinerjaKegiatanService pengukuranKinerjaKegiatanService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PengukuranKinerjaKegiatanController.class); - - @RequestMapping(value = "/save-pengukuran-kinerja-kegiatan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody PengukuranKinerjaKegiatanVO vo,HttpServletRequest request) { - - try{ - Map result = pengukuranKinerjaKegiatanService.addPengukuranKinerjaKegiatan(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 pengukuran kinerja kegiatan", 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 pengukuran kinerja kegiatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-pengukuran-kinerja-kegiatan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody PengukuranKinerjaKegiatanVO vo,HttpServletRequest request) { - - try{ - Map result = pengukuranKinerjaKegiatanService.addPengukuranKinerjaKegiatan(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 pengukuran kinerja kegiatan", 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 pengukuran kinerja kegiatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-pengukuran-kinerja-kegiatan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=pengukuranKinerjaKegiatanService.findAllPengukuranKinerjaKegiatan(); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pengukuran kinerja kegiatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all pengukuran kinerja kegiatan", 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/PengukuranPencahayaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java index 359562da..6e65da9b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java @@ -1,145 +1,98 @@ 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.PengukuranPencahayaanService; +import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; 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 org.springframework.web.servlet.ModelAndView; -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.PengukuranPencahayaanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; +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("/pengukuran-pencahayaan") -public class PengukuranPencahayaanController extends LocaleController{ - +public class PengukuranPencahayaanController extends LocaleController { + + private static final Logger LOGGER = getLogger(PengukuranPencahayaanController.class); + @Autowired private PengukuranPencahayaanService service; - private static final Logger LOGGER = LoggerFactory.getLogger(PengukuranPencahayaanController.class); - - @RequestMapping(value = "/get-unit-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getUnitRuangan(HttpServletRequest request) { - try { - Map result = service.getUnitRuangan(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-baku-mutu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBakuMutu(HttpServletRequest request) { - try { - Map result = service.getBakuMutu(); - 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 getBakuMutu", 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 getBakuMutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-pengukuran-pencahayaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengukuranPencahayaan(@Valid @RequestBody PengukuranKebisinganVO vo, HttpServletRequest request) { + @RequestMapping(value = "/save-pengukuran-pencahayaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePengukuranPencahayaan(@Valid @RequestBody PengukuranKebisinganVO vo, + HttpServletRequest request) { try { vo.setMenutype("pencahayaan"); - Map result = service.savePengukuranPencahayaan(vo); + Map result = service.savePengukuranPencahayaan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when savePengukuranPencahayaan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengukuranPencahayaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePengukuranPencahayaan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePengukuranPencahayaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-pengukuran-pencahayaan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-pengukuran-pencahayaan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPengukuranPencahayaan(HttpServletRequest request) { try { - Map result = service.getPengukuranPencahayaan(); - 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.getPengukuranPencahayaan(); + 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 getPengukuranKebisingan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPengukuranPencahayaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPengukuranPencahayaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - + } + @RequestMapping("/lapPengukuranPencahayaan") public ModelAndView lapPengukuranPencahayaan(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "startDate", required = true) String startDate, - @RequestParam(value = "endDate", required = true) String endDate) { - + @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate) { Map result = this.service.getRepotingPengukurangPencahayaan(startDate, endDate); - Map header = (Map) result.get("header"); String periode = header.get("startDate") == null ? "" : (String) header.get("startDate"); - periode = periode + (header.get("endDate") == null ? "" : " sd " + (String) header.get("endDate")); + periode = periode + (header.get("endDate") == null ? "" : " sd " + header.get("endDate")); m.addObject("dataSource", result.get("listData")); m.addObject("periode", periode); m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java index 1f0b6061..b8ea7194 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java @@ -1,24 +1,5 @@ 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 org.springframework.web.servlet.ModelAndView; - import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; @@ -27,66 +8,41 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PengukuranSuhuService; import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.PengukuranKebisinganVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/pengukuran-suhu") -public class PengukuranSuhuController extends LocaleController{ - +public class PengukuranSuhuController extends LocaleController { + + private static final Logger LOGGER = getLogger(PengukuranSuhuController.class); + @Autowired private PengukuranSuhuService service; - private static final Logger LOGGER = LoggerFactory.getLogger(PengukuranSuhuController.class); - - @RequestMapping(value = "/get-unit-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getUnitRuangan(HttpServletRequest request) { - try { - Map result = service.getUnitRuangan(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-baku-mutu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBakuMutu(HttpServletRequest request) { - try { - Map result = service.getBakuMutu(); - 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 getBakuMutu", 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 getBakuMutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-pengukuran-suhu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengukuranPencahayaan(@Valid @RequestBody PengukuranKebisinganVO vo, HttpServletRequest request) { + @RequestMapping(value = "/save-pengukuran-suhu", method = POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> savePengukuranPencahayaan(@Valid @RequestBody PengukuranKebisinganVO vo, + HttpServletRequest request) { try { vo.setMenutype("suhu"); - Map result = service.savePengukuranSuhu(vo); + Map result = service.savePengukuranSuhu(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when savePengukuranPencahayaan", e.getMessage()); @@ -98,16 +54,17 @@ public class PengukuranSuhuController extends LocaleController> getPengukuranKelembaban(HttpServletRequest request) { try { - Map result = service.getPengukuranSuhu(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = service.getPengukuranSuhu(); + if (null != result) { + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + } else { + return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getPengukuranKebisingan", e.getMessage()); @@ -119,7 +76,7 @@ public class PengukuranSuhuController extends LocaleController result = this.service.getRepotingPengukurangSuhu(startDate, endDate); - + Map header = (Map) result.get("header"); String periode = header.get("startDate") == null ? "" : (String) header.get("startDate"); periode = periode + (header.get("endDate") == null ? "" : " sd " + (String) header.get("endDate")); diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java index 79e64c70..40b1f53e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java @@ -1,59 +1,57 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PenilaianKinerjaSatpamService; +import com.jasamedika.medifirst2000.vo.PenilaianKinerjaSatpamVO; 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.PenilaianKinerjaSatpamService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PenilaianKinerjaSatpamVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/penilaian-kinerja-satpam") public class PenilaianKinerjaSatpamController extends LocaleController { + private static final Logger LOGGER = getLogger(PenilaianKinerjaSatpamController.class); + @Autowired private PenilaianKinerjaSatpamService penilaianKinerjaSatpamService; - private static final Logger LOGGER = LoggerFactory.getLogger(PenilaianKinerjaSatpamController.class); - - @RequestMapping(value = "/save-penilaian-kinerja-satpam/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-penilaian-kinerja-satpam/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePenilaianKinerjaSatpam( @Valid @RequestBody PenilaianKinerjaSatpamVO vo, HttpServletRequest request) { try { Map result = penilaianKinerjaSatpamService.savePenilaianKinerjaSatpam(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 Penilaian Kinerja Satpam", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePenilaianKinerjaSatpam", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Penilaian Kinerja Satpam", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePenilaianKinerjaSatpam", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java index e7451a35..5277dc51 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java @@ -1,352 +1,267 @@ 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.PenyuluhanService; +import com.jasamedika.medifirst2000.vo.PlanningDiklatHumasMarketVO; +import com.jasamedika.medifirst2000.vo.RencanaDiseminasiVO; 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.PenyuluhanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PlanningDiklatHumasMarketVO; -import com.jasamedika.medifirst2000.vo.RencanaDiseminasiVO; +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; @RestController @RequestMapping("/penyuluhan") -public class PenyuluhanController extends LocaleController{ - private static final Logger LOGGER = LoggerFactory.getLogger(PenyuluhanController.class); +public class PenyuluhanController extends LocaleController { + + private static final Logger LOGGER = getLogger(PenyuluhanController.class); @Autowired private PenyuluhanService penyuluhanService; - - @RequestMapping(value = "/save-rencana-penyuluhan", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE,consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaPenyuluhan( - @RequestBody RencanaDiseminasiVO vo, HttpServletRequest request) { + + @RequestMapping(value = "/save-rencana-penyuluhan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRencanaPenyuluhan(@RequestBody RencanaDiseminasiVO vo, + HttpServletRequest request) { try { Map result = this.penyuluhanService.saveStrukPlanning(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 saveStrukPlanning", 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); - } - } - - @RequestMapping(value = "/get-struk-planning-by-noplanning",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getLoadDataByNoPlanning( - @RequestParam(value = "noPlanning", required = true) String noPlanning, HttpServletRequest request) { - - try { - Map result = penyuluhanService.getPlanningByNoPlanning(noPlanning); - - 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 getLoadDataByNoPlanning", 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 getLoadDataByNoPlanning", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when saveStrukPlanning", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-planning-humas-by-noplanning",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPlanningHumasDiklatByNoPlanning( - @RequestParam(value = "noPlanning", required = true) String noPlanning, HttpServletRequest request) { + @RequestMapping(value = "/get-planning-humas-by-noplanning", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPlanningHumasDiklatByNoPlanning( + @RequestParam(value = "noPlanning") String noPlanning, HttpServletRequest request) { try { Map result = penyuluhanService.getListPlanningDHM(noPlanning); - 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 getLoadDataByNoPlanning", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getListPlanningDHM", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getListPlanningDHM", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-planning",method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-list-planning", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getLoadDataNoPlanning( @RequestParam(value = "noPlanning", required = false) String noPlanning, - @RequestParam(value = "dateStart", required = true) String dateStart, - @RequestParam(value = "dateEnd", required = true) String dateEnd, + @RequestParam(value = "dateStart") String dateStart, @RequestParam(value = "dateEnd") String dateEnd, HttpServletRequest request) { - try { - List> result = penyuluhanService.getInformasiRencanaPenyuluhan(noPlanning,dateEnd,dateStart); - + List> result = penyuluhanService.getInformasiRencanaPenyuluhan(noPlanning, dateEnd, + dateStart); 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 getLoadDataNoPlanning", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getInformasiRencanaPenyuluhan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getInformasiRencanaPenyuluhan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-no-planning/", method = RequestMethod.GET) - public ResponseEntity> getNoPlanning(HttpServletRequest request) { - + + @RequestMapping(value = "/get-no-planning/", method = GET) + public ResponseEntity> getNoPlanning(HttpServletRequest request) { try { - String noSurat= penyuluhanService.noPlanning(); - Map result=new HashMap(); + String noSurat = penyuluhanService.noPlanning(); + 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 noPlanning", 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 noPlanning", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-peserta-penyuluhan", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE,consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePesertaPenyuluhan( - @RequestBody RencanaDiseminasiVO vo, HttpServletRequest request) { - + + @RequestMapping(value = "/save-peserta-penyuluhan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePesertaPenyuluhan(@RequestBody RencanaDiseminasiVO vo, + HttpServletRequest request) { try { Map result = this.penyuluhanService.savePesertaPenyuluhan(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 savePesertaPenyuluhan", 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); - } - } - @RequestMapping(value = "/get-peserta-penyuluhan-by-noplanning/", method = RequestMethod.GET) - public ResponseEntity>> getPesertaPenyuluhanByNoPlanning( - @RequestParam(value = "noPlanning", required = true) String noPlanning, - HttpServletRequest request) { - - try { - List> result= penyuluhanService.getPesertaPenyuluhanByNoPlanning(noPlanning); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, 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); + LOGGER.error("Got JpaSystemException {} when savePesertaPenyuluhan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping( value = "/save-pelaksanaan-penyuluhan",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE,consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity savePelaksanaanPenyuluhan( - @RequestBody PlanningDiklatHumasMarketVO vo, HttpServletRequest request) { - + + @RequestMapping(value = "/get-peserta-penyuluhan-by-noplanning/", method = GET) + public ResponseEntity>> getPesertaPenyuluhanByNoPlanning( + @RequestParam(value = "noPlanning") String noPlanning, HttpServletRequest request) { + try { + List> result = penyuluhanService.getPesertaPenyuluhanByNoPlanning(noPlanning); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when getPesertaPenyuluhanByNoPlanning", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when getPesertaPenyuluhanByNoPlanning", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/save-pelaksanaan-penyuluhan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity savePelaksanaanPenyuluhan(@RequestBody PlanningDiklatHumasMarketVO vo, + HttpServletRequest request) { try { String result = this.penyuluhanService.savePelaksanaanPenyuluhan(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 savePelaksanaanPenyuluhan", 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 savePelaksanaanPenyuluhan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } } - @RequestMapping(value = "/get-daftar-pelaksanaan-diseminasi",method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-daftar-pelaksanaan-diseminasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListPlannDHMHukorByNoPlanningAndDate( @RequestParam(value = "noPlanning", required = false) String noPlanning, - @RequestParam(value = "dateStart", required = true) String dateStart, - @RequestParam(value = "dateEnd", required = true) String dateEnd, + @RequestParam(value = "dateStart") String dateStart, @RequestParam(value = "dateEnd") String dateEnd, HttpServletRequest request) { - try { - List> result = penyuluhanService.getListPlannDHMHukorByNoPlanningAndDate(noPlanning,dateStart,dateEnd); - + List> result = penyuluhanService.getListPlannDHMHukorByNoPlanningAndDate(noPlanning, + dateStart, dateEnd); 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 getLoadDataNoPlanning", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getListPlannDHMHukorByNoPlanningAndDate", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getListPlannDHMHukorByNoPlanningAndDate", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-pelaksanaan-by-noplanning",method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPlanningDHMHukorByNoPlanning( - @RequestParam(value = "noPlanning", required = true) String noPlanning, - HttpServletRequest request) { + @RequestMapping(value = "/get-daftar-pelaksanaan-by-noplanning", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPlanningDHMHukorByNoPlanning( + @RequestParam(value = "noPlanning") String noPlanning, HttpServletRequest request) { try { Map result = penyuluhanService.getPlanningDHMHukorByNoPlanning(noPlanning); - 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 getLoadDataNoPlanning", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getPlanningDHMHukorByNoPlanning", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getPlanningDHMHukorByNoPlanning", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-peserta-registrasi-by-noplanning/", method = RequestMethod.GET) - public ResponseEntity>> getPesertaRegistrasiByNoPlanning( - @RequestParam(value = "noPlanning", required = true) String noPlanning, - HttpServletRequest request) { - + + @RequestMapping(value = "/get-peserta-registrasi-by-noplanning/", method = GET) + public ResponseEntity>> getPesertaRegistrasiByNoPlanning( + @RequestParam(value = "noPlanning") String noPlanning, HttpServletRequest request) { try { - List> result= penyuluhanService.getPesertaRegistrasiByNoPlanning(noPlanning); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); + List> result = penyuluhanService.getPesertaRegistrasiByNoPlanning(noPlanning); + 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 getPesertaRegistrasiByNoPlanning", 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 getPesertaRegistrasiByNoPlanning", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-registrasi-peserta-penyuluhan", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE,consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPesertaPenyuluhan( - @RequestBody RencanaDiseminasiVO vo, HttpServletRequest request) { - + + @RequestMapping(value = "/save-registrasi-peserta-penyuluhan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRegistrasiPesertaPenyuluhan(@RequestBody RencanaDiseminasiVO vo, + HttpServletRequest request) { try { Map result = this.penyuluhanService.saveRegistrasiPesertaPenyuluhan(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 saveRegistrasiPesertaPenyuluhan", 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 saveRegistrasiPesertaPenyuluhan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java index a1d69836..91cb8040 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java @@ -1,32 +1,17 @@ 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 com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.service.PenyusunanEPlanningService; +import com.jasamedika.medifirst2000.vo.DetailSpekAnggaranVO; 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.PenyusunanEPlanningService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.DetailSpekAnggaranVO; -import com.jasamedika.medifirst2000.vo.PenyusunanEPlanningVO; +import java.util.Map; + +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/penyusunan-eplanning") @@ -35,47 +20,14 @@ public class PenyusunanEPlanningController extends LocaleController getPenyusunanTRPNBP( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "namaProduk") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, @RequestParam(value = "isVerifikasi", required = false) String isVerifikasi) { - Map resultPageMap = service.getPenyusunanEPlanning(page, limit, sort, dir, isVerifikasi); - - return resultPageMap; + return service.getPenyusunanEPlanning(page, limit, sort, dir, isVerifikasi); } - @RequestMapping(value = "/get-mata-anggaran", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map getMataAnggaran(@RequestParam(value = "id", required = false) Integer id) { - - Map resultPageMap = service.getMataAnggaran(id); - - return resultPageMap; - } - - @RequestMapping(value = "/save-penyusunan-eplanning", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePenyusunanEPlanning(@Valid @RequestBody PenyusunanEPlanningVO vo, - HttpServletRequest request) { - try { - Map result = service.savePenyusunanEPlanning(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 savePenyusunanEPlanning", 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 savePenyusunanEPlanning", 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/PenyusunanTRPNBPController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java index de1ed1ce..4e15b826 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java @@ -1,43 +1,43 @@ 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.PenyusunanTRPNBPService; +import com.jasamedika.medifirst2000.vo.PenyusunanTRPNPBVO; 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.PenyusunanTRPNBPService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PenyusunanTRPNPBVO; -import com.jasamedika.medifirst2000.vo.StrukPelayananDetailVO; +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("/penyusunan-trpnbp") -public class PenyusunanTRPNBPController extends LocaleController { +public class PenyusunanTRPNBPController extends LocaleController { + + private static final Logger LOGGER = getLogger(PenyusunanTRPNBPController.class); @Autowired private PenyusunanTRPNBPService service; - private static final Logger LOGGER = LoggerFactory.getLogger(PenyusunanTRPNBPController.class); - - @RequestMapping(value = "/get-penyusunan-trpnbp", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-penyusunan-trpnbp", method = GET, produces = APPLICATION_JSON_VALUE) public Map getPenyusunanTRPNBP( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @@ -45,41 +45,34 @@ public class PenyusunanTRPNBPController extends LocaleController resultPageMap = service.getPenyusunanTRPNBP(page, limit, sort, dir, dateStart, dateEnd); - - return resultPageMap; + return service.getPenyusunanTRPNBP(page, limit, sort, dir, dateStart, dateEnd); } - @RequestMapping(value = "/save-penyusunan-trpnbp", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-penyusunan-trpnbp", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePenyusunanTRPNBP(@Valid @RequestBody PenyusunanTRPNPBVO vo, HttpServletRequest request) { try { Map result = service.savePenyusunanTRPNBP(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 savePenyusunanTRPNBP", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePenyusunanTRPNBP", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePenyusunanTRPNBP", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePenyusunanTRPNBP", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-daftar-penyusunan-trpnbp", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-penyusunan-trpnbp", method = GET, produces = APPLICATION_JSON_VALUE) public Map getDaftarPenyusunanTRPNBP( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "tahun", required = false) Integer tahun) { - Map resultPageMap = service.getDaftarPenyusunanTRPNBP(page, limit, tahun); - - return resultPageMap; + return service.getDaftarPenyusunanTRPNBP(page, limit, tahun); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeralatanDetailController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeralatanDetailController.java deleted file mode 100644 index 11a2305a..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeralatanDetailController.java +++ /dev/null @@ -1,77 +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.PeralatanDetailService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ObservasiIGDVOCustom; -import com.jasamedika.medifirst2000.vo.PeralatanDetailCustomVO; -import com.jasamedika.medifirst2000.vo.PeralatanDetailVO; - -@RestController -@RequestMapping("/peralatan") -public class PeralatanDetailController extends LocaleController implements IBaseRestController{ - - @Autowired - private PeralatanDetailService peralatanDetailService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PeralatanDetailController.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(PeralatanDetailVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(PeralatanDetailVO 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/PeranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java index 4bc79b1f..15ec51c4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java @@ -1,118 +1,71 @@ 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 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.Peran; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PeranService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.PeranVO; - import net.kaczmarzyk.spring.data.jpa.domain.Equal; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; @RestController @RequestMapping("/peran") -public class PeranController extends LocaleController -implements IBaseRestController{ +public class PeranController extends LocaleController { + + private static final Logger LOGGER = getLogger(PeranController.class); @Autowired private PeranService peranService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(IndikatorRensarController.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(PeranVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(PeranVO 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 = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) - { - Map result = new HashMap(); - result = peranService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) { + Map result = peranService.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 PeranVO vo,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = RequestMethod.POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody PeranVO vo, HttpServletRequest request) { + try { Map result = peranService.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 Peran", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when peranService.save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add/update Peran", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when peranService.save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java index 1d446cd3..4d891815 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java @@ -1,34 +1,33 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.PeranHubungan; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PeranHubunganService; +import com.jasamedika.medifirst2000.vo.PeranHubunganVO; 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.PeranHubunganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PeranHubunganVO; +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.POST; /** * Controller class for PeranHubunganController @@ -37,70 +36,35 @@ import com.jasamedika.medifirst2000.vo.PeranHubunganVO; */ @RestController @RequestMapping("/peran-hubungan") -@JsonIgnoreProperties(ignoreUnknown = true) -public class PeranHubunganController extends LocaleController implements - IBaseRestController { - - private static final Logger LOGGER = LoggerFactory.getLogger(PeranHubunganController.class); +@JsonIgnoreProperties(ignoreUnknown = true) +public class PeranHubunganController extends LocaleController { + + private static final Logger LOGGER = getLogger(PeranHubunganController.class); @Autowired - private PeranHubunganService peranHubunganService; + private PeranHubunganService peranHubunganService; - @RequestMapping(value = "/save-peran-hubungan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody PeranHubunganVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-peran-hubungan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody PeranHubunganVO vo, + HttpServletRequest request) { try { - Map result = peranHubunganService.addPeranHubungan(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 )); + Map result = peranHubunganService.addPeranHubungan(vo); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - SaveLog("Peran Hubungan", "Pemeriksaan",request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - + SaveLog("Peran Hubungan", "Pemeriksaan", 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 addPeranHubungan", 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 addPeranHubungan", 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(PeranHubunganVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(PeranHubunganVO 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/PeriodePelaporanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java index a9862328..63b2b999 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java @@ -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.PeriodePelaporan; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PeriodePelaporanService; +import com.jasamedika.medifirst2000.vo.PasienVO; +import com.jasamedika.medifirst2000.vo.PeriodePelaporanVO; +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.PeriodePelaporan; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PeriodePelaporanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PeriodePelaporanVO; +import 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("/periode-pelaporan") -public class PeriodePelaporanController extends LocaleController -implements IBaseRestController{ +public class PeriodePelaporanController extends LocaleController { + + private static final Logger LOGGER = getLogger(PeriodePelaporanController.class); @Autowired private PeriodePelaporanService pelaporanService; - - 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(PeriodePelaporanVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(PeriodePelaporanVO 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 = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) - { - Map result = new HashMap(); - result = pelaporanService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) { + Map result = pelaporanService.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 PeriodePelaporanVO vo,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody PeriodePelaporanVO vo, + HttpServletRequest request) { + try { Map result = pelaporanService.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 Periode Pelaporan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when pelaporanService.save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add/update Periode Pelaporan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pelaporanService.save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } + }