diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java index 7a2ba69b..1a07aef8 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java @@ -1,89 +1,83 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.KontrakService; +import com.jasamedika.medifirst2000.vo.RekananSkKontrakDetailVO; +import com.jasamedika.medifirst2000.vo.RekananSkKontrakVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.KontrakService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.RekananSkKontrakDetailVO; -import com.jasamedika.medifirst2000.vo.RekananSkKontrakVO; +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("/kontrak") -public class KontrakController extends LocaleController{ - - private static final Logger LOGGER = LoggerFactory.getLogger(KontrakController.class); - +public class KontrakController extends LocaleController { + + private static final Logger LOGGER = getLogger(KontrakController.class); + @Autowired private KontrakService kontrakService; - - @RequestMapping(value = "/save-kontrak/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveKontrak(@Valid @RequestBody RekananSkKontrakVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-kontrak/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveKontrak(@Valid @RequestBody RekananSkKontrakVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = kontrakService.saveKontrak(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 kontrak", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKontrak", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save kontrak", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKontrak", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - - @RequestMapping(value = "/save-kontrak-detail/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveKontrakDetail(@Valid @RequestBody RekananSkKontrakDetailVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-kontrak-detail/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveKontrakDetail(@Valid @RequestBody RekananSkKontrakDetailVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = kontrakService.saveKontrakDetail(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 kontrak", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKontrakDetail", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save kontrak", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKontrakDetail", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/list-kontrak") @ResponseBody - public Map listkontrak( + public Map listkontrak( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "namaKontrak") String sort, @@ -91,17 +85,13 @@ public class KontrakController extends LocaleController{ @RequestParam(value = "noKontrak", required = false) String noKontrak, @RequestParam(value = "rekananId", required = false) Integer rekananId, @RequestParam(value = "namaKontrak", required = false) String namaKontrak) { - - Map resultPageMap = kontrakService.listKontrak(page, limit, sort, dir, noKontrak, rekananId, namaKontrak); - - return resultPageMap; + return kontrakService.listKontrak(page, limit, sort, dir, noKontrak, rekananId, + namaKontrak); } - - @RequestMapping(value = "/detail-kontrak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/detail-kontrak", method = GET, produces = APPLICATION_JSON_VALUE) public Map detilKontrak(@RequestParam(value = "noRec") String noRec) { - Map data = kontrakService.detilKontrak(noRec); - return data; + return kontrakService.detilKontrak(noRec); } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java index 5433b474..7163c0ec 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java @@ -1,190 +1,81 @@ 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.KontrakKinerja; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.KontrakKinerjaService; +import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO; +import com.jasamedika.medifirst2000.vo.PasienVO; +import net.kaczmarzyk.spring.data.jpa.domain.Equal; +import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specifications; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.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.KontrakKinerja; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.KontrakKinerjaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +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("/kontrak-kinerja") -public class KontrakKinerjaController extends LocaleController implements IBaseRestController{ - +public class KontrakKinerjaController extends LocaleController { + + private static final Logger LOGGER = getLogger(KontrakKinerjaController.class); + @Autowired private KontrakKinerjaService kontrakKinerjaService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(KontrakKinerjaController.class); - - @RequestMapping(value = "/save-kontrak-kinerja/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody KontrakKinerjaVO vo, HttpServletRequest request) { - - try { - Map result=kontrakKinerjaService.addKontrakKinerja(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 Kontrak Kinerja", 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 Kontrak Kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-kontrak-kinerja/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody KontrakKinerjaVO vo, HttpServletRequest request) { - - try { - Map result=kontrakKinerjaService.updateKontrakKinerja(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 Kontrak Kinerja", 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 Kontrak Kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-kontrak-kinerja/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=kontrakKinerjaService.findAllKontrakKinerja(); - 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 Kontrak Kinerja", 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 Kontrak Kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(KontrakKinerjaVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(KontrakKinerjaVO 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 kontrakKinerja, @Spec(path = "unitKerjaId", params = "unitKerjaId", spec = Equal.class) Specification ruangan, - @Spec(path = "tahun", params = "periode", spec = Equal.class) Specification tahun) - { - Specification spec = Specifications.where(kontrakKinerja).and(ruangan).and(tahun); - Map result = new HashMap(); - result = kontrakKinerjaService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "tahun", params = "periode", spec = Equal.class) Specification tahun) { + Specification spec = Specifications.where(kontrakKinerja).and(ruangan).and(tahun); + Map result = kontrakKinerjaService.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 List vos,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody List vos, + HttpServletRequest request) { + try { Map result = kontrakKinerjaService.save(vos); - 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 Kontrak Kinerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add/update Kontrak Kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java deleted file mode 100644 index 6940d3a0..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - - -import java.net.URISyntaxException; -import java.util.Collection; -import java.util.Map; - -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.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.entities.KonversiSatuan; -import com.jasamedika.medifirst2000.service.KonversiSatuanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.KonversiSatuanVO; - -@RestController -public class KonversiSatuanController extends LocaleController { - - private static final Logger log = LoggerFactory.getLogger(KonversiSatuanController.class); - - @Autowired - private KonversiSatuanService konversiSatuanService; - - /** - * Creates entity. - * - * @param konversiSatuan - * @return - * @throws URISyntaxException - */ - @RequestMapping(value = "/konversi_satuan", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity create(@Valid @RequestBody KonversiSatuanVO konversiSatuan) throws URISyntaxException { - log.debug("REST request to save KonversiSatuan: {}", konversiSatuan); - Map result = konversiSatuanService.save(konversiSatuan); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } - - /** - * Find one entity. - * - * @param id - * @return - */ - @RequestMapping(value = "/konversi_satuan/{id}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity get(@PathVariable String id) { - log.debug("REST request to get KonversiSatuan: {}", id); - Map result = konversiSatuanService.get(id); - if (result.get("data") != null) { - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } else { - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_FOUND); - } - } - - /** - * List collection of entities by product. - * - * @param produkId - * @return - */ - @RequestMapping(value = "/konversi_satuan/filter", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity getByProduk(@RequestParam("produkId") Integer produkId) { - log.debug("REST request to get KonversiSatuan by produk: ", produkId); - Map result = konversiSatuanService.listByProduk(produkId); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - - /** - * List collection of entities. - * - * @param pageable - * @return - * @throws URISyntaxException - */ - @SuppressWarnings("unchecked") - @RequestMapping(value = "/konversi_satuan/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> list(@RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "100") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue= "produk.namaProduk") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) throws URISyntaxException { - log.debug("REST request to get list of KonversiSatuan"); - Map result = konversiSatuanService.list(page, limit, sort, dir); - return constructListPageResult(result); - } - - /** - * Updates entity. - * - * @param konversiSatuan - * @return - * @throws URISyntaxException - */ - @RequestMapping(value = "/konversi_satuan", method = RequestMethod.PUT, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity update(@Valid @RequestBody KonversiSatuanVO konversiSatuan) - throws URISyntaxException { - log.debug("REST request to update KonversiSatuan: {}", konversiSatuan); - if (konversiSatuan.getNoRec().isEmpty()) { - return create(konversiSatuan); - } - - Map result = konversiSatuanService.update(konversiSatuan); - if (result.get("noRec") != null) { - return ResponseEntity.ok().body(result); - } else { - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_FOUND); - } - } - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java index 81544321..300628dd 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java @@ -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.Koping; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.KopingService; +import com.jasamedika.medifirst2000.vo.KopingVO; 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.KopingService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.KopingVO; +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 KopingController @@ -37,70 +36,35 @@ import com.jasamedika.medifirst2000.vo.KopingVO; */ @RestController @RequestMapping("/koping") -@JsonIgnoreProperties(ignoreUnknown = true) -public class KopingController extends LocaleController implements - IBaseRestController { - - private static final Logger LOGGER = LoggerFactory.getLogger(KopingController.class); +@JsonIgnoreProperties(ignoreUnknown = true) +public class KopingController extends LocaleController { + + private static final Logger LOGGER = getLogger(KopingController.class); @Autowired - private KopingService kopingService; + private KopingService kopingService; - @RequestMapping(value = "/save-koping", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody KopingVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-koping", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody KopingVO vo, HttpServletRequest request) { try { - Map result = kopingService.addKoping(vo); + Map result = kopingService.addKoping(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 )); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - SaveLog("Koping", "Pemeriksaan",request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - + SaveLog("Koping", "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 addKoping", 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 addKoping", 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(KopingVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(KopingVO 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/LapPembedahanDanInstruksiPascaBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java index 4e08b365..cf6d61ca 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java @@ -1,222 +1,128 @@ 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.LapPembedahanDanInstruksiPascaBedahService; +import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO; +import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperatifVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.LapPembedahanDanInstruksiPascaBedahService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO; -import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperatifVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/laporan-pembedahan-instruksi-pasca-bedah") -public class LapPembedahanDanInstruksiPascaBedahController extends LocaleController{ - private static final Logger LOGGER = LoggerFactory.getLogger(LapPembedahanDanInstruksiPascaBedahController.class); - +public class LapPembedahanDanInstruksiPascaBedahController extends LocaleController { + + private static final Logger LOGGER = getLogger(LapPembedahanDanInstruksiPascaBedahController.class); + @Autowired private LapPembedahanDanInstruksiPascaBedahService lapPembedahanDanInstruksiPascaBedahService; - - /* - @RequestMapping( - value = "/get-lap-pemedahan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getLoadLapPembedahan(HttpServletRequest request) { - try { - Map result = this.lapPembedahanDanInstruksiPascaBedahService.getLapPembedahan(); - - 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 getLoadLapPembedahan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadLapPembedahan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - - } - } - - @RequestMapping( - value = "/get-instruksi-pasca-bedah", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getLoadLapIntruksiPascaBedah(HttpServletRequest request) { - - try { - Map result = this.lapPembedahanDanInstruksiPascaBedahService.getInstruksiPascaBedah(); - - 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 getLoadLapIntruksiPascaBedah", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadLapIntruksiPascaBedah", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - - } - } - */ - - @RequestMapping( - value = "/save-pasca-bedah", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pasca-bedah", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePascaBedah( @Valid @RequestBody AsuhanKeperawatanPeriOperasiHeaderVO vo, HttpServletRequest request) { - try { - Map result = this.lapPembedahanDanInstruksiPascaBedahService.saveLapInstruksiPascaBedahHeader(vo); - + Map result = this.lapPembedahanDanInstruksiPascaBedahService + .saveLapInstruksiPascaBedahHeader(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 savePascaBedah", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when saveLapInstruksiPascaBedahHeader", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - - LOGGER.error("Got exception {} when savePascaBedah", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping( - value = "/get-list-by-notrans", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getLoadDataByNoTrans( - @RequestParam(value = "notrans", required = true) String notrans, HttpServletRequest request) { - - try { - Map result = this.lapPembedahanDanInstruksiPascaBedahService.getListAsuhanByNoTrans(notrans); - - 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 getLoadDataByNoTrans", 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 getLoadDataByNoTrans", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when saveLapInstruksiPascaBedahHeader", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping( - value = "get-pasien-operasi", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPasienDaftarOperasi( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { + + @RequestMapping(value = "/get-list-by-notrans", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getLoadDataByNoTrans(@RequestParam(value = "notrans") String notrans, + HttpServletRequest request) { + try { + Map result = this.lapPembedahanDanInstruksiPascaBedahService + .getListAsuhanByNoTrans(notrans); + 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 ServiceVOException {} when getListAsuhanByNoTrans", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when getListAsuhanByNoTrans", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "get-pasien-operasi", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getPasienDaftarOperasi(@RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { Map result = this.lapPembedahanDanInstruksiPascaBedahService.getPasienDaftarOperasi(noRec); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPasienDaftarOperasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getPasienDaftarOperasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPasienDaftarOperasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getPasienDaftarOperasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping( - value = "get-macam-infus", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "get-macam-infus", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getMacamInfus(HttpServletRequest request) { try { Map result = this.lapPembedahanDanInstruksiPascaBedahService.getMacamInfus(); - 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 getMacamInfus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when getMacamInfus", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getMacamInfus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when getMacamInfus", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java index e638de58..a1720768 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java @@ -1,114 +1,93 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.LaporanUjiHasil; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.LaporanUjiHasilService; +import com.jasamedika.medifirst2000.vo.LaporanUjiHasilVO; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dao.LaporanUjiHasilDao; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.LaporanUjiHasilService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.LaporanUjiHasilVO; +import 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("/laporan-uji-hasil") public class LaporanUjiHasilController extends LocaleController { - + + private static final Logger LOGGER = getLogger(LaporanUjiHasilController.class); + @Autowired - private LaporanUjiHasilService laporanUjiHasilService; - - @Autowired - private LaporanUjiHasilDao laporanUjiHasilDao; - - private static final Logger LOGGER = LoggerFactory - .getLogger(LaporanUjiHasilController.class); - - @RequestMapping(value = "/save-laporan-uji-hasil/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody LaporanUjiHasilVO vo,HttpServletRequest request) { - - try{ + private LaporanUjiHasilService laporanUjiHasilService; + + @RequestMapping(value = "/save-laporan-uji-hasil/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody LaporanUjiHasilVO vo, + HttpServletRequest request) { + try { Map result = laporanUjiHasilService.addLaporanUjiHasil(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add laporan uji hasil", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when addLaporanUjiHasil", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add laporan uji hasil", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addLaporanUjiHasil", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - - @SuppressWarnings("unchecked") @RequestMapping(value = "/list-laporan-uji-hasil") - public Map lisLimbahB3Masuk( + public Map lisLimbahB3Masuk( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "100") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd) { - - Map resultPageMap = laporanUjiHasilService.findLaporanUjiHasilByPeriode(page, limit, sort, dir, dateStart, dateEnd); - - return resultPageMap; + return laporanUjiHasilService.findLaporanUjiHasilByPeriode(page, limit, sort, dir, dateStart, dateEnd); } - + @RequestMapping(value = "/laporan-uji-hasil-detail") - public Map laporanUjiHasilDetail( - @RequestParam(value = "noRec", required = true) String noRec) { - - Map resultPageMap = laporanUjiHasilService.laporanUjiHasilDetail(noRec); - - return resultPageMap; + public Map laporanUjiHasilDetail(@RequestParam(value = "noRec") String noRec) { + return laporanUjiHasilService.laporanUjiHasilDetail(noRec); } - - @RequestMapping(value = "/get-rekanan", method = RequestMethod.GET) - public ResponseEntity> getRekanan(HttpServletRequest request) { + + @RequestMapping(value = "/get-rekanan", method = GET) + public ResponseEntity> getRekanan(HttpServletRequest request) { try { - Map rekanan = laporanUjiHasilService.getRakanan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(rekanan, HttpStatus.OK, mapHeaderMessage); + Map rekanan = laporanUjiHasilService.getRakanan(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(rekanan, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getRakanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getRakanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java index 51211e20..a34df702 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java @@ -1,1090 +1,710 @@ package com.jasamedika.medifirst2000.controller; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.dto.*; +import com.jasamedika.medifirst2000.service.LaundryService; +import com.jasamedika.medifirst2000.vo.KirimProdukVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dto.PelipatanDto; -import com.jasamedika.medifirst2000.dto.PenerimaanLinenDto; -import com.jasamedika.medifirst2000.dto.PenerimaanLinenExternalDto; -import com.jasamedika.medifirst2000.dto.PengeringanDto; -import com.jasamedika.medifirst2000.dto.ProsesCuciLinenDto; -import com.jasamedika.medifirst2000.dto.ProsesReturDto; -import com.jasamedika.medifirst2000.service.LaundryService; -import com.jasamedika.medifirst2000.service.StrukturNoCMService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.KirimProdukVO; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.DateUtil.toDate; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/laundry") -public class LaundryController extends LocaleController{ - +public class LaundryController extends LocaleController { + + private static final Logger LOGGER = getLogger(LaundryController.class); + @Autowired private LaundryService laundryService; - - @Autowired - private StrukturNoCMService strukturNoCMService; - - @RequestMapping(value="/get-all-penerimaan-linen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-all-penerimaan-linen", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllPenerimaanLinen( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - List> result = laundryService.getAllPenerimaanLinen(DateUtil.toDate(startPeriode), - DateUtil.toDate(endPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + List> result = laundryService.getAllPenerimaanLinen(toDate(startPeriode), + toDate(endPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - //savePermintaanLaundryInternal - @RequestMapping(value="/save-penerimaan-linen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> savePenerimaanLinen( - @RequestBody List dtos, + + @RequestMapping(value = "/save-penerimaan-linen", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> savePenerimaanLinen(@RequestBody List dtos, HttpServletRequest request) { List> result = laundryService.savePenerimaanLinen(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/generate-no-struk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/generate-no-struk", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getNoStruk(HttpServletRequest request) { Map result = laundryService.getGenerateNoStruk(); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllRuangan(HttpServletRequest request) { - List> result = laundryService.getAllRuangan(); - - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-satuan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-satuan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllSatuan(HttpServletRequest request) { List> result = laundryService.getAllSatuan(); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/get-all-penerimaan-linen-filter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-all-penerimaan-linen-filter", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllPenerimaanLinenFilter( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - String newEndPeriode=changeTimeEndPeriode(endPeriode); - List> result = laundryService.getAllPenerimaanLinen(DateUtil.toDate(startPeriode), - DateUtil.toDate(newEndPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + String newEndPeriode = changeTimeEndPeriode(endPeriode); + List> result = laundryService.getAllPenerimaanLinen(toDate(startPeriode), + toDate(newEndPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } private String changeTimeEndPeriode(String endPeriode) { - Date newDate=new Date(); + Date newDate = new Date(); String newEndPeriode; - if(endPeriode != null){ - String tgl=endPeriode.split(" ")[0]; - String time=endPeriode.split(" ")[1]; + if (endPeriode != null) { + String tgl = endPeriode.split(" ")[0]; String timeStamp = new SimpleDateFormat("HH:mm:ss").format(newDate); - newEndPeriode=tgl+" "+timeStamp; - }else{ - newEndPeriode=endPeriode; + newEndPeriode = tgl + " " + timeStamp; + } else { + newEndPeriode = null; } - System.out.println("TIME END PERIODE : "+newEndPeriode); + + LOGGER.info("TIME END PERIODE : {}", newEndPeriode); + return newEndPeriode; } - - @RequestMapping(value="/send-penerimaan-to-pencucian", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> sendPenerimaanToPencucian( - @RequestBody List dtos, + + @RequestMapping(value = "/send-penerimaan-to-pencucian", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> sendPenerimaanToPencucian(@RequestBody List dtos, HttpServletRequest request) { Map result = laundryService.sendPenerimaanToPencucian(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-kapasitas-bahan-mesin", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKapasitasBahanMesin( - @RequestParam(value="mesinId",required=true) Integer mesinId, - HttpServletRequest request) { - List> result = laundryService.getKapasitasMesin(mesinId); - - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-bahan-from-mesin-proses", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-bahan-from-mesin-proses", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getBahanMesinProses( - @RequestParam(value="mesinId",required=true) Integer mesinId, - @RequestParam(value="prosesCuciId",required=true) Integer prosesCuciId, - HttpServletRequest request) { + @RequestParam(value = "mesinId") Integer mesinId, + @RequestParam(value = "prosesCuciId") Integer prosesCuciId, HttpServletRequest request) { List> result = laundryService.getAllBahanFromMesinAndProses(mesinId, prosesCuciId); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/save-proses-cuci", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveProsesCuci( - @RequestBody ProsesCuciLinenDto dtos, + + @RequestMapping(value = "/save-proses-cuci", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> saveProsesCuci(@RequestBody ProsesCuciLinenDto dtos, HttpServletRequest request) { List> result = laundryService.prosesCuci2(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-all-pencucian", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-pencucian", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllPencucianFilter( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - String newEndPeriode=changeTimeEndPeriode(endPeriode); - List result = laundryService.getAllPencucianLinen(DateUtil.toDate(startPeriode), - DateUtil.toDate(newEndPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + String newEndPeriode = changeTimeEndPeriode(endPeriode); + List result = laundryService.getAllPencucianLinen(toDate(startPeriode), + toDate(newEndPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/send-cuci-bilas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> sendPencucianToPembilasan( - @RequestBody ProsesCuciLinenDto dtos, - HttpServletRequest request) { - Map result = laundryService.sendPencucianToPembilasan(dtos); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-proses-bilas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-proses-bilas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getProsesBilas( - @RequestParam(value="prosesCuci",required=true) String prosesCuci, - HttpServletRequest request) { + @RequestParam(value = "prosesCuci") String prosesCuci, HttpServletRequest request) { List> result = laundryService.getProsesBilas(prosesCuci); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-pembilasan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> savePembilasan( - @RequestBody ProsesCuciLinenDto dtos, + @RequestMapping(value = "/save-pembilasan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> savePembilasan(@RequestBody ProsesCuciLinenDto dtos, HttpServletRequest request) { List> result = laundryService.prosesBilas(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-all-pembilasan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-pembilasan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllPembilasanFilter( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - - String newEndPeriode=changeTimeEndPeriode(endPeriode); - //exsisting error - //List result = laundryService.getAllPembilasan2(DateUtil.toDate(startPeriode), - // DateUtil.toDate(newEndPeriode)); - - List result = laundryService.getAllPembilasan(DateUtil.toDate(startPeriode), - DateUtil.toDate(newEndPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + String newEndPeriode = changeTimeEndPeriode(endPeriode); + List result = laundryService.getAllPembilasan(toDate(startPeriode), toDate(newEndPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-pengeringan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> savePengeringan( - @RequestBody PengeringanDto dtos, + @RequestMapping(value = "/save-pengeringan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> savePengeringan(@RequestBody PengeringanDto dtos, HttpServletRequest request) { List> result = laundryService.prosesPengeringan(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-all-pengeringan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllPengeringanFilter( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - - String newEndPeriode=changeTimeEndPeriode(endPeriode); - List result = laundryService.getAllPengeringan(DateUtil.toDate(startPeriode), - DateUtil.toDate(newEndPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestMapping(value = "/get-produk-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getProdukPelipatanFilter(HttpServletRequest request) { + List> result = laundryService.getProdukPelipatan(); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-produk-pelipatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getProdukPelipatanFilter( - HttpServletRequest request) { - List> result = laundryService.getProdukPelipatan(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/save-pelipatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> savePelipatan( - @RequestBody PelipatanDto dtos, + @RequestMapping(value = "/save-pelipatan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> savePelipatan(@RequestBody PelipatanDto dtos, HttpServletRequest request) { List> result = laundryService.prosesPelipatan2(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-all-pelipatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllPelipatanFilter( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - String newEndPeriode=changeTimeEndPeriode(endPeriode); - - List result = laundryService.getAllPelipatan(DateUtil.toDate(startPeriode), - DateUtil.toDate(newEndPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + String newEndPeriode = changeTimeEndPeriode(endPeriode); + List result = laundryService.getAllPelipatan(toDate(startPeriode), toDate(newEndPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/cek-stok-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> cekStokRuangan( - @RequestBody ProsesCuciLinenDto dtos, + @RequestMapping(value = "/cek-stok-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> cekStokRuangan(@RequestBody ProsesCuciLinenDto dtos, HttpServletRequest request) { List> result = laundryService.cekStokRuangan(dtos); - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/cek-produk-pelipatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> cekProdukPelipatan( - @RequestBody PelipatanDto dto, + @RequestMapping(value = "/cek-produk-pelipatan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> cekProdukPelipatan(@RequestBody PelipatanDto dto, HttpServletRequest request) { Map result = laundryService.cekProdukLipat2(dto); - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-produk-penerimaan-linen-external", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getProdukPenerimaanLinenExternal( - HttpServletRequest request) { - List> result = laundryService.getProdukPenerimaanLinenExternal(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestMapping(value = "/get-produk-penerimaan-linen-external", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getProdukPenerimaanLinenExternal(HttpServletRequest request) { + List> result = laundryService.getProdukPenerimaanLinenExternal(); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-detail-penerimaan-linen-external", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getDetailPenerimaanLinenExternal( - @RequestParam(value="noRecStrukPelayanan",required=true) String noRecStrukPelayanan, - HttpServletRequest request) { - List> result = laundryService.getDetailPenerimaanLinenExternal(noRecStrukPelayanan); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/save-penerimaan-linen-external", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-penerimaan-linen-external", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> savePenerimaanLinenEkternal( - @RequestBody PenerimaanLinenExternalDto dto, - HttpServletRequest request) { + @RequestBody PenerimaanLinenExternalDto dto, HttpServletRequest request) { List> result = laundryService.savePenerimaanLinenExternal(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/send-pengeringan-to-pelipatan-external", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> sendPengeringanToPelipatanExternal( - @RequestBody List dtos, - HttpServletRequest request) { - Map result = laundryService.sendPenerimaanToPencucian(dtos); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-satuan-potong", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-satuan-potong", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllSatuanPotong(HttpServletRequest request) { List> result = laundryService.getAllSatuanPotong(); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pembilasan-to-pengeringan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pembilasan-to-pengeringan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getPembilasanToPengeringan( - @RequestParam(value="noRecStrukPelayanan",required=true) String noRecStrukPelayanan, - HttpServletRequest request) { - ProsesCuciLinenDto dto=new ProsesCuciLinenDto(); + @RequestParam(value = "noRecStrukPelayanan") String noRecStrukPelayanan, HttpServletRequest request) { + ProsesCuciLinenDto dto = new ProsesCuciLinenDto(); dto.setNoRecStrukPelayanan(noRecStrukPelayanan); ProsesCuciLinenDto result = laundryService.sendPembilasanToPengeringan(dto); - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-pengeringan-to-pelipatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pengeringan-to-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getPengeringanToPelipatan( - @RequestParam(value="noRecStrukPelayanan",required=true) String noRecStrukPelayanan, - HttpServletRequest request) { - ProsesCuciLinenDto dto=new ProsesCuciLinenDto(); + @RequestParam(value = "noRecStrukPelayanan") String noRecStrukPelayanan, HttpServletRequest request) { + ProsesCuciLinenDto dto = new ProsesCuciLinenDto(); dto.setNoRecStrukPelayanan(noRecStrukPelayanan); ProsesCuciLinenDto result = laundryService.sendPengeringanToPelipatan(dto); - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-struk-order-laundry-eksternal", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getStrukOrderExternal( - @RequestParam(value="noRecStrukPelayanan",required=true) String noRecStrukPelayanan, - HttpServletRequest request) { - Map result = laundryService.getStrukOrderExternal(noRecStrukPelayanan); - - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-pengambilan-eksternal", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-pengambilan-eksternal", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllPengambilanLinenEksternal( - @RequestParam(value="namaPelanggan",required=false) String namaPelanggan, - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - String newEndPeriode=changeTimeEndPeriode(endPeriode); - + @RequestParam(value = "namaPelanggan", required = false) String namaPelanggan, + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + String newEndPeriode = changeTimeEndPeriode(endPeriode); List result = laundryService.getAllPengambilanLinenEksternal(namaPelanggan, - DateUtil.toDate(startPeriode),DateUtil.toDate(newEndPeriode)); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + toDate(startPeriode), toDate(newEndPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-pengambilan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengambilan( - @RequestBody ProsesCuciLinenDto dto, + @RequestMapping(value = "/save-pengambilan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> savePengambilan(@RequestBody ProsesCuciLinenDto dto, HttpServletRequest request) { Map result = laundryService.prosesPengambilan(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/retur-laundry", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveReturLaundry( - @RequestBody ProsesReturDto dto, + @RequestMapping(value = "/retur-laundry", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveReturLaundry(@RequestBody ProsesReturDto dto, HttpServletRequest request) { Map result = laundryService.prosesReturLaundry(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-retur-linen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-retur-linen", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getAllReturLinen( - @RequestParam(value="noRecStrukPelayanan",required=true) String noRecStrukPelayanan, - HttpServletRequest request) { - PengeringanDto dto=new PengeringanDto(); + @RequestParam(value = "noRecStrukPelayanan") String noRecStrukPelayanan, HttpServletRequest request) { + PengeringanDto dto = new PengeringanDto(); dto.setNoRecStrukPelayanan(noRecStrukPelayanan); PengeringanDto result = laundryService.sendPengambilanLinenToReturLinen(dto); - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-all-retur-linen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-retur-linen", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllReturLinen( - @RequestParam(value="startPeriode",required=false) String startPeriode, - @RequestParam(value="endPeriode",required=false) String endPeriode, - HttpServletRequest request) { - String newEndPeriode=changeTimeEndPeriode(endPeriode); - List result = laundryService.getAllRetur(DateUtil.toDate(startPeriode), - DateUtil.toDate(newEndPeriode)); - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + @RequestParam(value = "startPeriode", required = false) String startPeriode, + @RequestParam(value = "endPeriode", required = false) String endPeriode, HttpServletRequest request) { + String newEndPeriode = changeTimeEndPeriode(endPeriode); + List result = laundryService.getAllRetur(toDate(startPeriode), toDate(newEndPeriode)); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-no-cm-laundry", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity getNoCmLaundry( - HttpServletRequest request) { - String result = strukturNoCMService.getStrukturNoCm("NoCmLaundry", 15, 1); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - - @RequestMapping(value="/save-order-linen-external", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderLinenInternal( - @RequestBody PenerimaanLinenExternalDto dto, - HttpServletRequest request) { - Map result = this.laundryService.savePermintaanLaundryExternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - //sesuai dengan meeting tgl.11.07.2018 - //dibuatkan form untuk pengambilan linen kotor - @RequestMapping(value="/save-pengambilan-linen-internal", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePengambilanLinenInternal( - @RequestBody PenerimaanLinenExternalDto dto, + @RequestMapping(value = "/save-pengambilan-linen-internal", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> savePengambilanLinenInternal(@RequestBody PenerimaanLinenExternalDto dto, HttpServletRequest request) { Map result = this.laundryService.savePengambilanLaundryInternal(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - - //diaktifkan lagi sesuai dengan permintaan - //hasil meeting dengan team laundry (ibu merlin,dkk) - //tgl.18.05.2018 - @RequestMapping(value="/save-penerimaan-linen-internal", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePenerimaanLinenInternal( - @RequestBody PenerimaanLinenExternalDto dto, + + @RequestMapping(value = "/save-penerimaan-linen-internal", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> savePenerimaanLinenInternal(@RequestBody PenerimaanLinenExternalDto dto, HttpServletRequest request) { Map result = this.laundryService.savePenerimaanLaundryInternal(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - //digunakan untuk getData Pengambilan linen Kotor dari Ruangan - //sesuai degan review oleh team laundry - //date : 11.05.2018 - //tgl.17.05.2018 - //diubah lagi dari pengambilan linen kotor menjadi permintaan linen bersih dari ruangan - @RequestMapping(value="/get-permintaan-linen-bersih-dari-ruangan", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getOrderLaundrySebelumDiterima( - @RequestParam(value="startDate",required=false) String startDate, - @RequestParam(value="endDate",required=false) String endDate, - HttpServletRequest request){ - Map result = this.laundryService.getOrderLaundrySebelumDiTerima(startDate, endDate); - return result; - } - - //tgl.17.05.2018 - //pengambilan linen kotor - @RequestMapping(value="/get-pengambilan-linen-kotor", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getPengambilanLinenKotor( - @RequestParam(value="startDate",required=false) String startDate, - @RequestParam(value="endDate",required=false) String endDate, - HttpServletRequest request){ - Map result = this.laundryService.getPengambilanLinenKotor(startDate, endDate); - return result; + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - //tgl.17.05.2018 - //pengambilan linen kotor - @RequestMapping(value="/get-pengambilan-linen-kotor-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getPengambilanLinenKotorByNoRec( - @RequestParam(value="noRec",required=false) String noRec, HttpServletRequest request){ - Map result = this.laundryService.getPengambilanLinenKotorByNoRec(noRec); - return result; + @RequestMapping(value = "/get-permintaan-linen-bersih-dari-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getOrderLaundrySebelumDiterima( + @RequestParam(value = "startDate", required = false) String startDate, + @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { + return this.laundryService.getOrderLaundrySebelumDiTerima(startDate, endDate); } - - - //digunakan untuk getData Pengambilan linen Kotor dari Ruangan - //sesuai degan review oleh team laundry, - //sesuai dengan hasil meeting - //tgl : 11.05.2018 - //diubah lagi dari pengambilan linen kotor menjadi permintaan linen bersih dari ruangan, - //berdasarkan hasil meeting - //tgl.17.05.2018 - @RequestMapping(value="/get-permintaan-linen-bersih-detail", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getPengambilanLinenKotorDetail( - @RequestParam("noRec")String noRec, HttpServletRequest request){ - Map result = this.laundryService.getOrderLaundrySebelumDiTerimaDetail(noRec); - return result; + + @RequestMapping(value = "/get-pengambilan-linen-kotor", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getPengambilanLinenKotor( + @RequestParam(value = "startDate", required = false) String startDate, + @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { + return this.laundryService.getPengambilanLinenKotor(startDate, endDate); } - - @RequestMapping(value="/get-order-laundry-diterima", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getOrderLaundryDiterima(){ - Map result = this.laundryService.getOrderLaundryDiterima(); - return result; - } - - @RequestMapping(value="/get-order-laundry-diterima-detail", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerOrderLaundrySebelumDeterimaDetail( - @RequestParam("noRec")String noRec, HttpServletRequest request){ - Map result = this.laundryService.getOrderLaundryDiterimaDetail(noRec); - return result; - } - - //by iwankasan - //ditest : 05.02.2018 - //proses-cuci-internal - @RequestMapping(value="/save-proses-cuci-internal-1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveProsesCuciInternal1( - @RequestBody ProsesCuciLinenDto dtos, + + @RequestMapping(value = "/get-permintaan-linen-bersih-detail", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getPengambilanLinenKotorDetail(@RequestParam("noRec") String noRec, HttpServletRequest request) { - List> result = laundryService.prosesCuci(dtos); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return this.laundryService.getOrderLaundrySebelumDiTerimaDetail(noRec); } - - @RequestMapping(value="/save-proses-cuci-internal", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesCuciInternal( - @RequestBody ProsesCuciLinenDto dtos, + + @RequestMapping(value = "/save-proses-cuci-internal", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesCuciInternal(@RequestBody ProsesCuciLinenDto dtos, HttpServletRequest request) { Map result = this.laundryService.saveProsesPencucianInternal(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/save-proses-cuci-external", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesCuciExternal( - @RequestBody ProsesCuciLinenDto dtos, + + @RequestMapping(value = "/save-proses-cuci-external", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesCuciExternal(@RequestBody ProsesCuciLinenDto dtos, HttpServletRequest request) { Map result = this.laundryService.saveProsesPencucianExternal(dtos); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-proses-cuci", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesCuci( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, - HttpServletRequest request){ - Map result = this.laundryService.getProsesCucianInternal(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-cuci-external", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesCuciExternal( - @RequestParam("startDate")String startDate, @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesCucianExternal(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-cuci-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesCuciByNoRec(@RequestParam("noRec")String noRec, HttpServletRequest request){ - Map result = this.laundryService.getProsesCuciianInternalByNoRec(noRec); - return result; - } - - @RequestMapping(value="/get-proses-cuci-external-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesCuciExternalByNoRec(@RequestParam("noRec")String noRec, HttpServletRequest request){ - Map result = this.laundryService.getProsesCucianExternalByNoRec(noRec); - return result; - } - - @RequestMapping(value="/save-proses-pengeringan-internal", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesPengeringan( - @RequestBody PengeringanDto dto, HttpServletRequest request){ - Map result = this.laundryService.savePengeringanInternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/save-proses-pengeringan-external", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesPengeringanExternal( - @RequestBody PengeringanDto dto, HttpServletRequest request){ - Map result = this.laundryService.savePengeringanExternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-proses-pengeringan", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesPengeringan( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesPengeringanInternal(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-pengeringan-external", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesPengeringanExternal( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesPengeringanExternal(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-pengeringan-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesPengeringanByNoRec(@RequestParam("noRec")String noRec, HttpServletRequest request){ - Map result = this.laundryService.getProsesPengeringanInternalByNoRec(noRec); - return result; - } - - @RequestMapping(value="/get-proses-pengeringan-external-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesPengeringanExternalByNoRec(@RequestParam("noRec")String noRec, HttpServletRequest request){ - Map result = this.laundryService.getProsesPengeringanExternalByNoRec(noRec); - return result; - } - - @RequestMapping(value="/save-proses-pelipatan", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesPelipatan( - @RequestBody PelipatanDto dto, HttpServletRequest request){ - Map result = this.laundryService.savePelipatanInternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/save-proses-pelipatan-external", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesPelipatanExternal( - @RequestBody PelipatanDto dto, HttpServletRequest request){ - Map result = this.laundryService.savePelipatanExternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-proses-pelipatan", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesPelipatan( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesPelipatan(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-pelipatan-external", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesPelipatanExternal( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesPelipatanExternal(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-pelipatan-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesPelipatanByNoRec( - @RequestParam("noRec")String noRec, - HttpServletRequest request){ - Map result = this.laundryService.getProsesPelipatanByNoRec(noRec); - return result; - } - - @RequestMapping(value="/get-proses-pelipatan-external-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map gerProsesPelipatanExternalByNoRec( - @RequestParam("noRec")String noRec, - HttpServletRequest request){ - Map result = this.laundryService.getProsesPelipatanExternalByNoRec(noRec); - return result; - } - - @RequestMapping(value="/save-proses-rollpress", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesRollPress( - @RequestBody PelipatanDto dto, HttpServletRequest request){ - Map result = this.laundryService.saveRollPressInternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/save-proses-rollpress-external", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveProsesRollPressExternal( - @RequestBody PelipatanDto dto, HttpServletRequest request){ - Map result = this.laundryService.saveRollPressExternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-proses-rollpress", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesRollPress( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesRollPress(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-rollpress-external", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesRollPressExternal( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request){ - Map result = this.laundryService.getProsesRollPressExternal(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-proses-rollpress-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesRollPressByNoRec( - @RequestParam("noRec")String noRec, - HttpServletRequest request){ - Map result = this.laundryService.getProsesRollPressByNoRec(noRec); - return result; - } - - @RequestMapping(value="/get-proses-rollpress-external-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProsesRollPressExternalByNoRec( - @RequestParam("noRec")String noRec, - HttpServletRequest request){ - Map result = this.laundryService.getProsesRollPressExternalByNoRec(noRec); - return result; - } - - @RequestMapping(value="/get-bahan-laundry", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getBahanLaundry(HttpServletRequest request){ - Map result = this.laundryService.getBahanLaundry(); - return result; - } - - @RequestMapping(value="/get-laundry-linen-bersih", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getStockLaundryLinenBersih(HttpServletRequest request) { - Map result = this.laundryService.getStockLaundryLinenBersih(); - return result; - } - - @RequestMapping(value="/save-distribusi-linen", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDistribusiLinen( - @RequestBody PenerimaanLinenExternalDto dto, HttpServletRequest request){ - Map result = this.laundryService.savePenditribusianLinenInternal(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-distribusi-linen-bersih", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getDistribusiLinenBersih( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request) { - Map result = this.laundryService.getDistribusiLinen(startDate, endDate); - return result; - } - - @RequestMapping(value="/get-distribusi-linen-bersih-by-ruangan", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getDistribusiLinenBersihByRuangan( - @RequestParam("startDate")String startDate, - @RequestParam("endDate")String endDate, HttpServletRequest request) { - Map result = this.laundryService.getDistribusiLinenByRuangan(startDate, endDate); - return result; - } - - @RequestMapping(value="/save-verifikasi-penerimaan-linenbersih", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveVerifikasiPenerimaanLinenBersih( - @RequestBody PenerimaanLinenDto dto, HttpServletRequest request){ - Map result = this.laundryService.updateTanggalTerimaLinenBersihByRuangan(dto); - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - - @RequestMapping(value="/get-distribusi-linen-bersih-detail", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getDistribusiLinenBersihDetailByRuangan( - @RequestParam("noRec")String noRec, HttpServletRequest request) { - Map result = this.laundryService.getDistribusiLinenBersihDetailByNoRec(noRec); - return result; - } - - - @RequestMapping(value = "/get-penerimaan-linen-internal-by-periode", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getPenerimaanLinenInternalByDate( - @RequestParam(value = "startDate") String startDate, - @RequestParam(value = "endDate") String endDate - ) { - Map result = this.laundryService.getPenerimaanLinenInternal(startDate, endDate); - return result; - } - - @RequestMapping(value = "/get-penerimaan-linen-external-by-periode", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getPenerimaanLinenExternalByDate( - @RequestParam(value = "startDate") String startDate, - @RequestParam(value = "endDate") String endDate - ) { - Map result = this.laundryService.getPenerimaanLinenExternal(startDate, endDate); - return result; - } - - @RequestMapping(value = "/get-distribusi-linen-external", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getDistribusiLinenExternal( - @RequestParam(value = "startDate") String startDate, - @RequestParam(value = "endDate") String endDate - ) { - Map result = this.laundryService.getDistribusiLinenExternal(startDate, endDate); - return result; + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-distribusi-linen-external-by-norec", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getDistribusiLinenBersihDetailByNoRec( - @RequestParam("noRec")String noRec, HttpServletRequest request) { - Map result = this.laundryService.getDistribusiLinenExternalByNoRec(noRec); - return result; + @RequestMapping(value = "/get-proses-cuci", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesCuci(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesCucianInternal(startDate, endDate); } - - @RequestMapping(value="/save-distribusi-linen-external", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDistribusiLinenExternal( - @RequestBody PenerimaanLinenExternalDto dto, HttpServletRequest request){ + + @RequestMapping(value = "/get-proses-cuci-external", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesCuciExternal(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesCucianExternal(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-cuci-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesCuciByNoRec(@RequestParam("noRec") String noRec, HttpServletRequest request) { + return this.laundryService.getProsesCuciianInternalByNoRec(noRec); + } + + @RequestMapping(value = "/get-proses-cuci-external-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesCuciExternalByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesCucianExternalByNoRec(noRec); + } + + @RequestMapping(value = "/save-proses-pengeringan-internal", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesPengeringan(@RequestBody PengeringanDto dto, + HttpServletRequest request) { + Map result = this.laundryService.savePengeringanInternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/save-proses-pengeringan-external", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesPengeringanExternal(@RequestBody PengeringanDto dto, + HttpServletRequest request) { + Map result = this.laundryService.savePengeringanExternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-proses-pengeringan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesPengeringan(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesPengeringanInternal(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-pengeringan-external", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesPengeringanExternal(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesPengeringanExternal(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-pengeringan-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesPengeringanByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesPengeringanInternalByNoRec(noRec); + } + + @RequestMapping(value = "/get-proses-pengeringan-external-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesPengeringanExternalByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesPengeringanExternalByNoRec(noRec); + } + + @RequestMapping(value = "/save-proses-pelipatan", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesPelipatan(@RequestBody PelipatanDto dto, + HttpServletRequest request) { + Map result = this.laundryService.savePelipatanInternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/save-proses-pelipatan-external", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesPelipatanExternal(@RequestBody PelipatanDto dto, + HttpServletRequest request) { + Map result = this.laundryService.savePelipatanExternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-proses-pelipatan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesPelipatan(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesPelipatan(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-pelipatan-external", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesPelipatanExternal(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesPelipatanExternal(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-pelipatan-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesPelipatanByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesPelipatanByNoRec(noRec); + } + + @RequestMapping(value = "/get-proses-pelipatan-external-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map gerProsesPelipatanExternalByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesPelipatanExternalByNoRec(noRec); + } + + @RequestMapping(value = "/save-proses-rollpress", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesRollPress(@RequestBody PelipatanDto dto, + HttpServletRequest request) { + Map result = this.laundryService.saveRollPressInternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/save-proses-rollpress-external", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveProsesRollPressExternal(@RequestBody PelipatanDto dto, + HttpServletRequest request) { + Map result = this.laundryService.saveRollPressExternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-proses-rollpress", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesRollPress(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesRollPress(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-rollpress-external", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesRollPressExternal(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getProsesRollPressExternal(startDate, endDate); + } + + @RequestMapping(value = "/get-proses-rollpress-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesRollPressByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesRollPressByNoRec(noRec); + } + + @RequestMapping(value = "/get-proses-rollpress-external-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProsesRollPressExternalByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getProsesRollPressExternalByNoRec(noRec); + } + + @RequestMapping(value = "/get-bahan-laundry", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getBahanLaundry(HttpServletRequest request) { + return this.laundryService.getBahanLaundry(); + } + + @RequestMapping(value = "/get-laundry-linen-bersih", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getStockLaundryLinenBersih(HttpServletRequest request) { + return this.laundryService.getStockLaundryLinenBersih(); + } + + @RequestMapping(value = "/save-distribusi-linen", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDistribusiLinen(@RequestBody PenerimaanLinenExternalDto dto, + HttpServletRequest request) { + Map result = this.laundryService.savePenditribusianLinenInternal(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-distribusi-linen-bersih", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDistribusiLinenBersih(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getDistribusiLinen(startDate, endDate); + } + + @RequestMapping(value = "/get-distribusi-linen-bersih-by-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDistribusiLinenBersihByRuangan(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate, HttpServletRequest request) { + return this.laundryService.getDistribusiLinenByRuangan(startDate, endDate); + } + + @RequestMapping(value = "/save-verifikasi-penerimaan-linenbersih", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveVerifikasiPenerimaanLinenBersih(@RequestBody PenerimaanLinenDto dto, + HttpServletRequest request) { + Map result = this.laundryService.updateTanggalTerimaLinenBersihByRuangan(dto); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-distribusi-linen-bersih-detail", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDistribusiLinenBersihDetailByRuangan(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getDistribusiLinenBersihDetailByNoRec(noRec); + } + + @RequestMapping(value = "/get-penerimaan-linen-internal-by-periode", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getPenerimaanLinenInternalByDate(@RequestParam(value = "startDate") String startDate, + @RequestParam(value = "endDate") String endDate) { + return this.laundryService.getPenerimaanLinenInternal(startDate, endDate); + } + + @RequestMapping(value = "/get-penerimaan-linen-external-by-periode", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getPenerimaanLinenExternalByDate(@RequestParam(value = "startDate") String startDate, + @RequestParam(value = "endDate") String endDate) { + return this.laundryService.getPenerimaanLinenExternal(startDate, endDate); + } + + @RequestMapping(value = "/get-distribusi-linen-external", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDistribusiLinenExternal(@RequestParam(value = "startDate") String startDate, + @RequestParam(value = "endDate") String endDate) { + return this.laundryService.getDistribusiLinenExternal(startDate, endDate); + } + + @RequestMapping(value = "/get-distribusi-linen-external-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getDistribusiLinenBersihDetailByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + return this.laundryService.getDistribusiLinenExternalByNoRec(noRec); + } + + @RequestMapping(value = "/save-distribusi-linen-external", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDistribusiLinenExternal(@RequestBody PenerimaanLinenExternalDto dto, + HttpServletRequest request) { Map result = this.laundryService.savePenditribusianLinenExternal(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/get-jenis-linen", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-jenis-linen", method = GET, produces = APPLICATION_JSON_VALUE) public Map getJenisLinen(HttpServletRequest request) { - Map result = this.laundryService.getJenisLinen(); - return result; + return this.laundryService.getJenisLinen(); } - - @RequestMapping(value="/get-mesin-by-jenis-linen", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getMesinByJenisLinen( - @RequestParam("idJenis")Integer idJenis, HttpServletRequest request) { - Map result = this.laundryService.getMesinByJenisLinen(idJenis); - return result; + + @RequestMapping(value = "/get-mesin-by-jenis-linen", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getMesinByJenisLinen(@RequestParam("idJenis") Integer idJenis, + HttpServletRequest request) { + return this.laundryService.getMesinByJenisLinen(idJenis); } - - @RequestMapping(value="/get-produk-by-mesin-jenis-linen", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) - public Map getProdukByMesinJenisLinen( - @RequestParam("idJenis")Integer idJenis, @RequestParam("idMesin")Integer idMesin, HttpServletRequest request) { - Map result = this.laundryService.getMappingProdukByJenisLinen(idJenis, idMesin); - return result; + + @RequestMapping(value = "/get-produk-by-mesin-jenis-linen", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getProdukByMesinJenisLinen(@RequestParam("idJenis") Integer idJenis, + @RequestParam("idMesin") Integer idMesin, HttpServletRequest request) { + return this.laundryService.getMappingProdukByJenisLinen(idJenis, idMesin); } - - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java deleted file mode 100644 index 26574b08..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.LembarKonsultasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.LembarKonsultasiVO; - -@RestController -@RequestMapping("/lembarKonsultasi") -public class LembarKonsultasiController extends LocaleController implements -IBaseRestController{ - - @Autowired - private LembarKonsultasiService lembarKonsultasiService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(LembarKonsultasiController.class); - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @RequestMapping(value = "/save-lembar-konsultasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody LembarKonsultasiVO vo, HttpServletRequest request) { - - try { - Map result=lembarKonsultasiService.saveLembarKonsultasi(vo); - - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Lembar Konsultasi", 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 Lembar Konsultasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-lembar-konsultasi/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> editVO(@Valid @RequestBody LembarKonsultasiVO vo,HttpServletRequest request) { - try { - Map result=lembarKonsultasiService.updateLembarKonsultasi(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 Lembar Konsultasi", 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 Lembar Konsultasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - @Override - public ResponseEntity addVO(LembarKonsultasiVO vo) { - return null; - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/search-lembar-konsultasi-by-nocm/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoCm(@RequestParam(value = "noCm", required = false, defaultValue = "000000000000001") String noCm,HttpServletRequest request){ - Map result = lembarKonsultasiService.findByNocm(noCm); - Boolean dataFound=new Boolean((boolean) result.get("dataFound")); - if(dataFound){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - - - @Override - public ResponseEntity editVO(LembarKonsultasiVO vo) { - return null; - } - - - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java index 6d103059..60078534 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java @@ -1,81 +1,54 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.LevelTingkatDto; import com.jasamedika.medifirst2000.service.LevelTingkatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PegawaiSKGajiVO; +import com.jasamedika.medifirst2000.vo.LevelTingkatVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController -@RequestMapping(value="/level-tingkat") -public class LevelTingkatController extends LocaleController { - +@RequestMapping(value = "/level-tingkat") +public class LevelTingkatController extends LocaleController { + @Autowired private LevelTingkatService levelTingkatService; - @RequestMapping(value="/save-level-tingkat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@RequestBody LevelTingkatDto dto, - HttpServletRequest request) { - Map result = levelTingkatService.save(dto); + @RequestMapping(value = "/save-level-tingkat", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@RequestBody LevelTingkatDto dto, HttpServletRequest request) { + Map result = levelTingkatService.save(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-level-tingkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> get( - @RequestParam(value="idLevelTingkat", required = true) Integer idLevelTingkat, - HttpServletRequest request) { - Map result = levelTingkatService.get(idLevelTingkat); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-level-tingkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAll( - HttpServletRequest request) { + @RequestMapping(value = "/get-all-level-tingkat", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getAll(HttpServletRequest request) { List> result = levelTingkatService.getAll(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + if (result != null) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-all-departemen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllDetailKategoriPegawai( - HttpServletRequest request) { - List> result = levelTingkatService.getAllDepartemen(); - - if (result!=null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java index ba348924..7f3ae58e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java @@ -1,241 +1,145 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.LimbahB3Keluar; +import com.jasamedika.medifirst2000.entities.LimbahB3Masuk; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.LimbahB3KeluarService; +import com.jasamedika.medifirst2000.service.LimbahB3MasukService; +import com.jasamedika.medifirst2000.vo.LimbahB3KeluarVO; 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.LimbahB3KeluarService; -import com.jasamedika.medifirst2000.service.LimbahB3MasukService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.LimbahB3KeluarVO; +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("/limbah-b3-keluar") public class LimbahB3KeluarController extends LocaleController { - + + private static final Logger LOGGER = getLogger(LimbahB3KeluarController.class); + @Autowired - private LimbahB3KeluarService limbahB3KeluarService; - + private LimbahB3KeluarService limbahB3KeluarService; + @Autowired - private LimbahB3MasukService limbahB3MasukService;; - - private static final Logger LOGGER = LoggerFactory - .getLogger(LimbahB3KeluarController.class); - - @RequestMapping(value = "/save-limbah-b3-keluar/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody LimbahB3KeluarVO vo,HttpServletRequest request) { - - try{ - Map result = limbahB3KeluarService.addLimbahB3Keluar(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 limbah b3 keluar", 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 limbah b3 keluar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-limbah-b3-keluar/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updatLimbahB3Keluar(@Valid @RequestBody LimbahB3KeluarVO vo,HttpServletRequest request) { - - try{ - Map result = limbahB3KeluarService.addLimbahB3Keluar(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 limbah b3 keluar", 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 limbah b3 keluar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-limbah-b3-keluar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=limbahB3KeluarService.findAllLimbahB3Keluar(); - 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 limbah b3 keluar", 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 limbah b3 keluar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/delete-limbah-b3-keluar", method = RequestMethod.GET) - public ResponseEntity deleteNamaBahan(@RequestParam(value = "noRec", required = true) String noRec) { - + private LimbahB3MasukService limbahB3MasukService; + + @RequestMapping(value = "/save-limbah-b3-keluar/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody LimbahB3KeluarVO vo, + HttpServletRequest request) { try { - if (limbahB3KeluarService.deleteLimbahB3Keluar(noRec) == true) - return RestUtil.getJsonResponse(noRec +" Dihapus", HttpStatus.CREATED); - + Map result = limbahB3KeluarService.addLimbahB3Keluar(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete Limbah b3 keluar", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addLimbahB3Keluar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete Limbah b3 keluar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addLimbahB3Keluar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); } - - @RequestMapping(value = "/find-by-periode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataByPriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, HttpServletRequest request) { - Map result = limbahB3KeluarService - .findLimbahB3KeluarByPeriode(periodeAwal, periodeAkhir); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + @RequestMapping(value = "/update-limbah-b3-keluar/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> updatLimbahB3Keluar(@Valid @RequestBody LimbahB3KeluarVO vo, + HttpServletRequest request) { + return addVO(vo, request); + } + + @RequestMapping(value = "/delete-limbah-b3-keluar", method = GET) + public ResponseEntity deleteNamaBahan(@RequestParam(value = "noRec") String noRec) { + try { + if (limbahB3KeluarService.deleteLimbahB3Keluar(noRec)) + return getJsonResponse(noRec + " Dihapus", CREATED); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when deleteLimbahB3Keluar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when deleteLimbahB3Keluar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - - @RequestMapping(value = "/get-data-by-periode", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getDataByPeriode( - @RequestParam(value = "periodeAwal") String periodeAwal, - @RequestParam(value = "periodeAkhir") String periodeAkhir - ) { - Map result = this.limbahB3KeluarService.getLimbahB3Keluar(periodeAwal, periodeAkhir); - return result; - } - - @RequestMapping(value = "/get-rekanan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-rekanan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getRekanan() { - Map result = this.limbahB3KeluarService.getRekanan(); - return result; + return this.limbahB3KeluarService.getRekanan(); } - - @RequestMapping(value = "/get-sisa-limbah-di-tps-by-jenis-limbah", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getSisaLimbahDiTpsByJenisLimbah(@RequestParam(value="jenisLimbah")Integer jenisLimbah) { - Map result = this.limbahB3KeluarService.getSisaLimbahdiTpsByJenisLimbah(jenisLimbah); - return result; + + @RequestMapping(value = "/get-sisa-limbah-di-tps-by-jenis-limbah", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getSisaLimbahDiTpsByJenisLimbah( + @RequestParam(value = "jenisLimbah") Integer jenisLimbah) { + return this.limbahB3KeluarService.getSisaLimbahdiTpsByJenisLimbah(jenisLimbah); } - - @RequestMapping(value = "/get-total-limbah-by-periode/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-total-limbah-by-periode/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getTotalByPeriode( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir, - @RequestParam(value = "jenisLibahB3MasukId", required = true) Integer jenisLibahB3MasukId,HttpServletRequest request) { - - try { - Map result=limbahB3MasukService.getTotalBeratLimbah(periodeAwal, periodeAkhir, jenisLibahB3MasukId); - 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 total LimbahB3Masuk", 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 total LimbahB3Masuk", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - - @RequestMapping(value = "/get-total-limbah-by-periode-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestParam(value = "periodeAwal") String periodeAwal, + @RequestParam(value = "periodeAkhir") String periodeAkhir, + @RequestParam(value = "jenisLibahB3MasukId") Integer jenisLibahB3MasukId, HttpServletRequest request) { + try { + Map result = limbahB3MasukService.getTotalBeratLimbah(periodeAwal, periodeAkhir, + jenisLibahB3MasukId); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when getTotalBeratLimbah", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when getTotalBeratLimbah", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/get-total-limbah-by-periode-list/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getTotalByPeriodeList( - @RequestParam(value = "periodeAwal", required = true) String periodeAwal, - @RequestParam(value = "periodeAkhir", required = true) String periodeAkhir,HttpServletRequest request) { - - try { - Map result=limbahB3MasukService.getTotalBeratLimbahList(periodeAwal, periodeAkhir); - 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 total LimbahB3Masuk", 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 total LimbahB3Masuk", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @SuppressWarnings("unchecked") + @RequestParam(value = "periodeAwal") String periodeAwal, + @RequestParam(value = "periodeAkhir") String periodeAkhir, HttpServletRequest request) { + try { + Map result = limbahB3MasukService.getTotalBeratLimbahList(periodeAwal, periodeAkhir); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when getTotalBeratLimbahList", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when getTotalBeratLimbahList", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + @RequestMapping(value = "/list-limbah-b3-keluar") - public Map lisLimbahB3Masuk( + public Map lisLimbahB3Masuk( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "100") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -243,10 +147,7 @@ public class LimbahB3KeluarController extends LocaleController @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "jenisLimbah", required = false) Integer jenisLimbah) { - - Map resultPageMap = limbahB3KeluarService.lisLimbahB3Keluar(page, limit, sort, dir, dateStart, dateEnd, jenisLimbah); - - return resultPageMap; + return limbahB3KeluarService.lisLimbahB3Keluar(page, limit, sort, dir, dateStart, dateEnd, jenisLimbah); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java index 89bed1cc..79a20c84 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java @@ -1,31 +1,7 @@ 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.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.security.core.Authentication; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.GantiPasswordDTO; import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.exception.ServiceVOException; @@ -34,106 +10,95 @@ import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.PasswordUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.LoginUserVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.*; +import static com.jasamedika.medifirst2000.core.web.WebConstants.PageParameter.*; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/user") public class LoginUserController extends LocaleController { - //Alter by Syamsu - @Autowired private TokenAuthenticationService tokenAuthenticationService; - //Alter by Syamsu - @Autowired private LoginUserService loginUserService; private static final Logger LOGGER = LoggerFactory.getLogger(LoginUserController.class); - - /// Alter by Syamsu untuk edit data password user - // nanti tambahkan AppPermission, sehingga minta supervisi user name dan password otomatis untuk dirinya sendiri - @RequestMapping(value = "/update-password-user/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/update-password-user/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) @AppPermission(AppPermission.SPECIALS) - public ResponseEntity updatePassword(@Valid @RequestBody GantiPasswordDTO ubah, HttpServletRequest request){ - + public ResponseEntity updatePassword(@Valid @RequestBody GantiPasswordDTO ubah, + HttpServletRequest request) { try { Authentication authentication = tokenAuthenticationService.getAuthentication(request); - String namaUser = authentication.getName(); List loginUser = loginUserService.findByNamaUser(namaUser); - if (!loginUser.isEmpty()) { - LoginUser user = loginUser.get(0); - PasswordUtil passwordUtil = new PasswordUtil(); - - Boolean isValidPassword = passwordUtil.isPasswordEqual(ubah.getPassword(), user.getKataSandi()); - + boolean isValidPassword = passwordUtil.isPasswordEqual(ubah.getPassword(), user.getKataSandi()); if (isValidPassword) { - LoginUserVO vo = loginUserService.findById(ubah.getId()); vo.setId(ubah.getId()); vo.setKataSandi(ubah.getKataSandi()); LoginUserVO result = loginUserService.update(vo); - - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS)); - return RestUtil.getJsonResponse(String.valueOf(vo.getId()), HttpStatus.OK, mapHeaderMessage); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS)); + return getJsonResponse(String.valueOf(vo.getId()), OK, mapHeaderMessage); } else { - LOGGER.error("Got exception {} when update password User failed"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "update password User failed"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got exception when update password User failed"); + addHeaderMessage(ERROR_MESSAGE, "update password User failed"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - }else{ - LOGGER.error("Got exception {} when update Pegawai, password invalid"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Password"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + } else { + LOGGER.error("Got exception when update Pegawai, password invalid"); + addHeaderMessage(ERROR_MESSAGE, "Invalid Password"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - LOGGER.error("Got exception {} when update Pegawai"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "User is unauthorized"); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got exception when update Pegawai"); + addHeaderMessage(ERROR_MESSAGE, "User is unauthorized"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update password User", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update password User", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } catch (Exception ex) { - LOGGER.error("Got exception {} when update password User", ex.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ex.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got Exception {} when update", ex.getMessage()); + addHeaderMessage(ERROR_MESSAGE, ex.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - -// return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); - } - - - - @RequestMapping(value = "/edit-user/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity editVO(@Valid @RequestBody LoginUserVO vo, HttpServletRequest request) { - try { - LoginUserVO result = loginUserService.update(vo); - if (null != result) - return RestUtil.getJsonResponse(String.valueOf(vo.getId()), HttpStatus.OK); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update User", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update User", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE); } @SuppressWarnings("unchecked") @@ -144,123 +109,93 @@ public class LoginUserController extends LocaleController { @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { Map resultPageMap = loginUserService.findAllWithPageAndLimitAndSortByAndDirectionParameter(page, limit, sort, dir); - return constructListPageResult(resultPageMap, request); } @SuppressWarnings("rawtypes") private ResponseEntity constructListPageResult(Map map, HttpServletRequest request) { - if (map == null) { - Map mapHeaderMessage = new HashMap(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, "0"); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, "0"); - mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Data not found."); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, mapHeaderMessage); + Map mapHeaderMessage = new HashMap<>(); + mapHeaderMessage.put(TOTAL_PAGE_HEADER, "0"); + mapHeaderMessage.put(TOTAL_COUNT_HEADER, "0"); + mapHeaderMessage.put(ERROR_MESSAGE, "Data not found."); + return getJsonResponse(null, BAD_REQUEST, mapHeaderMessage); } else { @SuppressWarnings("unchecked") - Collection vos = (Collection) map.get(WebConstants.PageParameter.LIST_DATA); - - Map mapHeaderMessage = new HashMap(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, - String.valueOf(map.get(WebConstants.PageParameter.TOTAL_PAGES))); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, - String.valueOf(map.get(WebConstants.PageParameter.TOTAL_ELEMENTS))); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - - return RestUtil.getJsonResponse(vos, HttpStatus.OK, mapHeaderMessage); + Collection vos = (Collection) map.get(LIST_DATA); + Map mapHeaderMessage = new HashMap<>(); + mapHeaderMessage.put(TOTAL_PAGE_HEADER, String.valueOf(map.get(TOTAL_PAGES))); + mapHeaderMessage.put(TOTAL_COUNT_HEADER, String.valueOf(map.get(TOTAL_ELEMENTS))); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(vos, OK, mapHeaderMessage); } } - - - @RequestMapping(value = "/list-user", method = RequestMethod.GET) - public ResponseEntity> listUser() { - List loginUserVOs = loginUserService.findAll(); - return RestUtil.getJsonResponse(loginUserVOs, HttpStatus.OK, mapHeaderMessage); - } - - @RequestMapping(value = "/get-user", method = RequestMethod.GET) + @RequestMapping(value = "/get-user", method = GET) public ResponseEntity getUser() { LoginUser loginUser = loginUserService.getLoginUser(); - return RestUtil.getJsonResponse(loginUser, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(loginUser, OK, mapHeaderMessage); } - - @RequestMapping(value = "/get-all-user/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-user/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllUser(HttpServletRequest request) { - Map result = null; - try{ - result = loginUserService.getAllUser(); - Boolean dataFound=new Boolean((boolean) result.get("dataFound")); - - if(dataFound){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); + try { + Map result = loginUserService.getAllUser(); + boolean dataFound = (boolean) result.get("dataFound"); + if (dataFound) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - }catch (Exception e){ - e.printStackTrace(); + return getJsonResponse(result, OK); + } catch (Exception e) { + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - - //----------------------------------------------------------------------------------------------------------------------------- - - @RequestMapping(value = "/get-load-data", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-load-data", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData(HttpServletRequest request) { try { - Map result = loginUserService.getLoadData(); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } else{ - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND,mapHeaderMessage); + Map result = loginUserService.getLoadData(); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-login-user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveLoginUser(@Valid @RequestBody LoginUserVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-login-user", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveLoginUser(@Valid @RequestBody LoginUserVO vo, + HttpServletRequest request) { try { - Map result = loginUserService.saveUpdateLoginUser(vo); + Map result = loginUserService.saveUpdateLoginUser(vo); if (CommonUtil.isNullOrEmpty(result.get("statusError"))) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusError")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + headerMessageCustom.put("label-success", result.get("statusError").toString()); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveLoginUser", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUpdateLoginUser", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveLoginUser", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUpdateLoginUser", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/check-nama-user", method = RequestMethod.GET) - public boolean namaUserExists(@RequestParam(value = "nama-user", required = true) String namaUser) { - List users = loginUserService.findByNamaUser(namaUser); - if (!users.isEmpty()) { - return true; - } - return false; - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java index 85c72cf4..71a33b20 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java @@ -1,115 +1,87 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.text.SimpleDateFormat; -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.ManagementDashboardService; +import com.jasamedika.medifirst2000.vo.ManagementDashboardVO; 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.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.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.ManagementDashboardService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AkunVO; -import com.jasamedika.medifirst2000.vo.ManagementDashboardVO; +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.DateUtil.toDate; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/management") -public class ManagementController extends LocaleController { +public class ManagementController extends LocaleController { + + private static final Logger LOGGER = getLogger(ManagementController.class); - private static final Logger LOGGER = LoggerFactory.getLogger(ManagementController.class); @Autowired private ManagementDashboardService managementDashboardService; - @RequestMapping(value = "/save-management-dashboard", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveManagementDashboard(@Valid @RequestBody ManagementDashboardVO vo,HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result=managementDashboardService.saveManagementDashboard(vo); - BroadcastMessage("Dashboard", ""); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); - } + @RequestMapping(value = "/save-management-dashboard", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveManagementDashboard(@Valid @RequestBody ManagementDashboardVO vo, + HttpServletRequest request) { + try { + Map result = managementDashboardService.saveManagementDashboard(vo); + BroadcastMessage("Dashboard", ""); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when saveManagementDashboard", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveManagementDashboard", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); + } + } + @RequestMapping(value = "/get-save-management-dashboard/{nama}", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getsaveManagementDashboard(@PathVariable("nama") String nama, + HttpServletRequest request) { + try { + if (nama.equals("-")) + nama = ""; + Map result = managementDashboardService.findByName(nama); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); + } catch (Exception e) { + throw new ServiceVOException(e.getMessage()); } + } - @RequestMapping(value = "/get-save-management-dashboard/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getsaveManagementDashboard( - @PathVariable("nama") String nama, - HttpServletRequest request) { - Map result = null; - try{ - if(nama.equals("-")) - nama=""; - result = managementDashboardService.findByName(nama); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }catch (Exception e){ - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-dashboard/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDashboard( - @PathVariable("noRec") String noRec, - HttpServletRequest request) { - Map result = null; - try{ - - result = managementDashboardService.findByNoRec(noRec); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }catch (Exception e){ - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-detail-dashboard/{noRec}/{start}/{until}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDetailDashboard( - @PathVariable("noRec") String noRec, - @PathVariable("start") String start, - @PathVariable("until") String until, - HttpServletRequest request) { - Map result = null; - try{ - - result = managementDashboardService.findByNoDetail(noRec,DateUtil.toDate(start),DateUtil.toDate(until)); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }catch (Exception e){ - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + @RequestMapping(value = "/get-detail-dashboard/{noRec}/{start}/{until}", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getDetailDashboard(@PathVariable("noRec") String noRec, + @PathVariable("start") String start, @PathVariable("until") String until, HttpServletRequest request) { + try { + Map result = managementDashboardService.findByNoDetail(noRec, toDate(start), toDate(until)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); + } catch (Exception e) { + throw new ServiceVOException(e.getMessage()); } + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java index 754ad59a..1bdb0326 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java @@ -1,142 +1,58 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ManajemenPromosiService; +import com.jasamedika.medifirst2000.vo.ManajemenPromosiVO; 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.ManajemenPromosiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ManajemenPromosiVO; +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("/manajemen-promosi") -public class ManajemenPromosiController extends LocaleController implements IBaseRestController { - +public class ManajemenPromosiController extends LocaleController { + + private static final Logger LOGGER = getLogger(ManajemenPromosiController.class); + @Autowired private ManajemenPromosiService manajemenPromosiService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(ManajemenPromosiController.class); - - @RequestMapping(value = "/save-manajemen-promosi/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody ManajemenPromosiVO vo, HttpServletRequest request) { - + + @RequestMapping(value = "/save-manajemen-promosi/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody ManajemenPromosiVO vo, + HttpServletRequest request) { try { - Map result=manajemenPromosiService.addManajemenPromosi(vo); + Map result = manajemenPromosiService.addManajemenPromosi(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add ManajemenPromosi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addManajemenPromosi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add ManajemenPromosi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addManajemenPromosi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-manajemen-promosi/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody ManajemenPromosiVO vo, HttpServletRequest request) { - - try { - Map result=manajemenPromosiService.updateManajemenPromosi(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 ManajemenPromosi", 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 ManajemenPromosi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-manajemen-promosi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=manajemenPromosiService.findAllManajemenPromosi(); - 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 sasaran strategis", 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 sasaran strategis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(ManajemenPromosiVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(ManajemenPromosiVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - }