diff --git a/jasamedika-sdm/pom.xml b/jasamedika-sdm/pom.xml index 99390876..1c44a65c 100644 --- a/jasamedika-sdm/pom.xml +++ b/jasamedika-sdm/pom.xml @@ -265,6 +265,14 @@ ${commons-collections.version} + + + org.projectlombok + lombok + ${project.lombok.version} + provided + + diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java index 568fc300..a7da30e1 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java @@ -6,73 +6,51 @@ import java.text.SimpleDateFormat; /** * Constants value * - * @author Roberto + * @author Roberto, Syamsu */ public class Constants { + public static final String JASAMEDIKA = "SkFTQU1FRElLQQ=="; public static final String APP_VERSION = "APP_VERSION"; - public static final String AUTH_HEADER_NAME = "X-AUTH-TOKEN"; - - //for example public static final String IDR = "IDR"; public static final String RP = "RP"; - public static final String COMMA = ","; - public static final DecimalFormat ONE_COMA_FORMAT = new DecimalFormat("#.#"); - public static final DecimalFormat TWO_COMA_FORMAT = new DecimalFormat( - "#.##"); - - public static final DecimalFormat MONEY_FORMAT_WITHOUT_COMMA = new DecimalFormat( - "###,###"); + public static final DecimalFormat TWO_COMA_FORMAT = new DecimalFormat("#.##"); + public static final DecimalFormat MONEY_FORMAT_WITHOUT_COMMA = new DecimalFormat("###,###"); public static final class DateFormat { - public static final SimpleDateFormat yyyyMMdd = new SimpleDateFormat( - "yyyyMMdd"); - public static final SimpleDateFormat dd_MMM_yyyy = new SimpleDateFormat( - "dd MMM yyyy"); - public static final SimpleDateFormat yyyy_MM_dd_HH_mm_ss = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - public static final SimpleDateFormat yyyy_MM_dd_T_HH_mm_ss = new SimpleDateFormat( - "yyyy-MM-dd'T'HH:mm:ss"); - public static final SimpleDateFormat yyyyMMdd_HH_mm_ss = new SimpleDateFormat( - "yyyyMMdd HH:mm:ss"); + public static final SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); + public static final SimpleDateFormat dd_MMM_yyyy = new SimpleDateFormat("dd MMM yyyy"); + public static final SimpleDateFormat yyyy_MM_dd_HH_mm_ss = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final SimpleDateFormat yyyy_MM_dd_T_HH_mm_ss = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + public static final SimpleDateFormat yyyyMMdd_HH_mm_ss = new SimpleDateFormat("yyyyMMdd HH:mm:ss"); } - /* message */ public static final class MessageInfo { public static final String INFO_MESSAGE = "INFO_MESSAGE"; public static final String WARNING_MESSAGE = "WARNING_MESSAGE"; public static final String ERROR_MESSAGE = "ERROR_MESSAGE"; public static final String EXCEPTION_MESSAGE = "EXCEPTION_MESSAGE"; - } - + /* locale id (indonesia / default) and en (english) */ public static final class Locale { public static final String INA = "ina"; public static final String EN = "en"; - } - //Update perubahan di sini, harus disamakan dengan package yang ada di jasamedika-bussiness - //com.jasamedika.medifirst2000.logging.hibernate.async + public static final class HttpHeader { public static final String SUPERVISING = "Supervising"; public static final String MODULE = "Module"; public static final String FORM = "Form"; public static final String ACTION = "Action"; - public static final String URL_FORM = "AlamatUrlForm"; // syamsu public static final String KD_RUANGAN = "KdRuangan"; // syamsu public static final String KD_RUANGAN_T = "KdRuanganT"; // syamsu public static final String KD_RUANGAN_A = "KdRuanganA"; // syamsu - public static final String TGL_KIRIM = "tglKirim"; // syamsu -// public static final String RUANGAN_TUJUAN = "ruanganTujuan"; // syamsu -// public static final String ID_RUANGAN_TUJUAN_ALT = "ruanganTujuanAlt"; // syamsu + public static final String TGL_KIRIM = "tglKirim"; // syamsuu public static final String KD_USER = "KdUser"; // syamsu - - } - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java index d15ae2fc..a83ec988 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java @@ -14,5 +14,4 @@ public final class MessageResource { public static final String LABEL_SUCCESS_CREATED = "label.success.created"; public static final String LABEL_SUCCESS_OK = "label.success.ok"; public static final String LABEL_UPDATE_DATA_CUTI = "label.update.data.cuti"; - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/AkomodasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/AkomodasiController.java index 354dc220..89f04ee4 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/AkomodasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/AkomodasiController.java @@ -1,35 +1,33 @@ package com.jasamedika.medifirst2000.controller; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import 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.MapRuanganToAkomodasiService; +import com.jasamedika.medifirst2000.service.RuanganService; +import com.jasamedika.medifirst2000.vo.MapRuanganToAkomodasiVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -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.MapRuanganToAkomodasiService; -import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.MapRuanganToAkomodasiVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.CommonUtil.isNotNullOrEmpty; +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.*; @RestController @RequestMapping("/akomodasi") @@ -41,121 +39,114 @@ public class AkomodasiController extends LocaleController ruanganService; - @RequestMapping(value = "/save-mapping", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-mapping", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMappingAkomodasi(HttpServletRequest request, @Valid @RequestBody MapRuanganToAkomodasiVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); try { - MapRuanganToAkomodasiVO resultVo = new MapRuanganToAkomodasiVO(); - if (CommonUtil.isNotNullOrEmpty(vo.getId())) { + MapRuanganToAkomodasiVO resultVo; + if (isNotNullOrEmpty(vo.getId())) { resultVo = mapRuanganToAkomodasiService.update(vo); } else { resultVo = mapRuanganToAkomodasiService.add(vo); } result.put("data", resultVo); - if (CommonUtil.isNotNullOrEmpty(result)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + if (isNotNullOrEmpty(result)) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when add mapping akomodasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when add mapping akomodasi", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add mapping akomodasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when add mapping akomodasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/delete-mapping", method = RequestMethod.DELETE) + @RequestMapping(value = "/delete-mapping", method = DELETE) public ResponseEntity deleteMappingAkomodasi(HttpServletRequest request, @RequestParam("id") Integer id) { try { Boolean result = mapRuanganToAkomodasiService.delete(id); if (result) { - return RestUtil.getJsonResponse("Mapping is deleted successsfully", HttpStatus.OK); + return getJsonResponse("Mapping is deleted successsfully", OK); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when delete mapping akomodasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when delete mapping akomodasi", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete mapping akomodasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when delete mapping akomodasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-mapping", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-mapping", method = GET) public ResponseEntity> getAllMappingAkomodasi(HttpServletRequest request) { try { List result = mapRuanganToAkomodasiService.getAllActiveAkomodasi(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when get all mapping akomodasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when get all mapping akomodasi", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all mapping akomodasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when get all mapping akomodasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-mapping", method = RequestMethod.GET) + @RequestMapping(value = "/get-mapping", method = GET) public ResponseEntity getMappingAkomodasi(HttpServletRequest request, @RequestParam("id") Integer id) { try { MapRuanganToAkomodasiVO result = mapRuanganToAkomodasiService.findById(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when get all mapping akomodasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findById", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all mapping akomodasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findById", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kamar-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kamar-by-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getKamarByRuangan(HttpServletRequest request, - @RequestParam(value = "idRuangan", required = true) Integer idRuangan) { - List> result = null; + @RequestParam(value = "idRuangan") Integer idRuangan) { try { - result = ruanganService.findKamarByRuangan(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = ruanganService.findKamarByRuangan(idRuangan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/get-akomodasi-ruangan-by-mapping-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-akomodasi-ruangan-by-mapping-produk", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAkomodasiRuanganByMappingProduk(HttpServletRequest request, - @RequestParam(value = "idRuangan", required = true) Integer idRuangan) { - List> result = null; + @RequestParam(value = "idRuangan") Integer idRuangan) { try { - result = mapRuanganToAkomodasiService.getAkomodasiRuanganByMapProduk(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = mapRuanganToAkomodasiService.getAkomodasiRuanganByMapProduk(idRuangan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/GenericServiceController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/GenericServiceController.java index c2e3b5d9..7764464c 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/GenericServiceController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/GenericServiceController.java @@ -1,82 +1,62 @@ package com.jasamedika.medifirst2000.controller; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.service.ModelService; +import com.jasamedika.medifirst2000.util.JsonUtil; +import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.persistence.Column; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; -import org.json.JSONException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.service.ModelService; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.CREATED; +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; @RestController @RequestMapping("/service") public class GenericServiceController extends LocaleController { - @Autowired - private ModelService modelService; + private static final Logger LOG = LoggerFactory.getLogger(GenericServiceController.class); + private static final String CONTENT_TYPE = "Content-Type"; - @SuppressWarnings("rawtypes") - public static List GetFields(Class data) { - List items = new ArrayList(); - Class parent = data.getSuperclass(); - Class tmpClass = null; - if (BaseModelVO.class.isAssignableFrom(data.getClass())) { - tmpClass = BaseTransactionVO.class; - } else if (BaseTransactionVO.class.isAssignableFrom(data.getClass())) { - tmpClass = BaseMasterVO.class; - } + @Autowired + private ModelService modelService; - if ((data == tmpClass)) { - for (Field field : data.getDeclaredFields()) { - items.add(field); - } - return items; - } - - if (parent != null) { - for (Field field : GetFields(data.getSuperclass())) { - items.add(field); - } - } - - for (Field field : data.getDeclaredFields()) { - items.add(field); - } + public static List GetFields(Class data) { + List items = new ArrayList<>(); + Class parent = data.getSuperclass(); + if (parent != null) + items.addAll(GetFields(data.getSuperclass())); + items.addAll(Arrays.asList(data.getDeclaredFields())); return items; } - @RequestMapping(value = "/get-setting/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-setting/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getData(@RequestParam(value = "prefix", required = false) String prefix) { - - return RestUtil.getJsonResponse(GetSettingDataFixed(prefix), HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(GetSettingDataFixed(prefix), CREATED, mapHeaderMessage); } - @RequestMapping(value = "/list-generic/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/list-generic/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> listGeneric( @RequestParam(value = "view", required = false) String entity, @RequestParam(value = "select", required = false) String field, @@ -91,72 +71,59 @@ public class GenericServiceController extends LocaleController= 0) { - if (criteria == null) - criteria = query.replace("filter[filters][0][filter][field]=", ""); - else - criteria += "," + query.replace("filter[filters][0][filter][field]=", ""); - - } else if (query.indexOf("filter[filters][0][filter][value]") >= 0) { - if (values == null) - values = query.replace("filter[filters][0][filter][value]=", ""); - else - values += "," + query.replace("filter[filters][0][filter][value]=", ""); + if (query.contains("filter[filters][0][filter][field]")) { + criteriaBuilder.append(",").append(query.replace("filter[filters][0][filter][field]=", "")); + } else if (query.contains("filter[filters][0][filter][value]")) { + valuesBuilder.append(",").append(query.replace("filter[filters][0][filter][value]=", "")); } } - + values = valuesBuilder.toString(); + criteria = criteriaBuilder.toString(); if (field.equals("*")) { - field = ""; - + StringBuilder fieldBuilder = new StringBuilder(); for (Field fieldItem : GetFields(Class.forName("com.jasamedika.medifirst2000.entities." + entity))) { - { - String name = fieldItem.getName(); - if (name.equals("serialVersionsUID")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : fieldItem.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - + String name = fieldItem.getName(); + if (name.equals("serialVersionsUID")) + continue; + boolean valid = false; + for (java.lang.annotation.Annotation annotation : fieldItem.getDeclaredAnnotations()) { + if (annotation instanceof JoinColumn) { + valid = true; + } else if (annotation instanceof Column) { + Column column = (Column) annotation; + if (column.name().endsWith("Fk")) + if (!fieldItem.getName().endsWith("Id")) + valid = true; + } else if (annotation instanceof OneToMany) { + valid = true; } - if (valid == false) - if (field.equals("")) - field += fieldItem.getName(); - else - field += "," + fieldItem.getName(); } + if (!valid) + if (fieldBuilder.toString().isEmpty()) + fieldBuilder.append(fieldItem.getName()); + else + fieldBuilder.append(",").append(fieldItem.getName()); } + field = fieldBuilder.toString(); } else if (field.equals("**")) { field = "*"; } - - // for dateformat using [date] List> modelGenericVO = modelService.getAllData(entity, field, take, skip, page, pageSize, logic, value, fieldS, operator, ignorecase, criteria, values); HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); try { - return new ResponseEntity>>(JsonUtil.ToMaps(modelGenericVO), headers, - HttpStatus.OK); + return new ResponseEntity<>(JsonUtil.ToMaps(modelGenericVO), headers, OK); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + LOG.error(e.getMessage()); } - return null; } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java index 5830ef9e..f609e502 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java @@ -1,6 +1,5 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.core.web.WebConstants; @@ -8,7 +7,6 @@ import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import com.jasamedika.medifirst2000.vo.custom.CpptDokterVo; import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaVO; @@ -19,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.*; @@ -33,6 +30,11 @@ import java.util.Date; import java.util.List; import java.util.Map; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.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; @@ -138,20 +140,19 @@ public class IkiDanRemunerasiController extends LocaleController result = service.loadData(); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when loadData", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when loadData", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -161,20 +162,19 @@ public class IkiDanRemunerasiController extends LocaleController result = service.getKalkulasiDataRemunerasi(id, date); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getKalkulasiDataRemunerasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getKalkulasiDataRemunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -184,18 +184,17 @@ public class IkiDanRemunerasiController extends LocaleController result = service.saveIkiRemunerasi(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 ServiceVOException {} when saveIkiRemunerasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveIkiRemunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -205,20 +204,19 @@ public class IkiDanRemunerasiController extends LocaleController result = service.getKalkulasiDataRemunerasiPegawai(date); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getKalkulasiDataRemunerasiPegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getKalkulasiDataRemunerasiPegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -229,12 +227,11 @@ public class IkiDanRemunerasiController extends LocaleController result = service.savePirDanIku(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 ServiceVOException {} when add Pegawai Jadwal kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePirDanIku", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pegawai Jadwal kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePirDanIku", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -294,19 +288,16 @@ public class IkiDanRemunerasiController extends LocaleController result = service.findAllTargetCapaianLayananJamKerja(periode, idKsm); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get all target dan capaian layanan jam kerja", - sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllTargetCapaianLayananJamKerja", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get all target dan capaian layanan jam kerja", - jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllTargetCapaianLayananJamKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -315,19 +306,16 @@ public class IkiDanRemunerasiController extends LocaleController result = service.findAllTargetCapaianLayananLuarJamKerja(periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get all target dan capaian layanan luar jam kerja", - sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllTargetCapaianLayananLuarJamKerja", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get all target dan capaian layanan luar jam kerja", - jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllTargetCapaianLayananLuarJamKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -342,20 +330,19 @@ public class IkiDanRemunerasiController extends LocaleController result = anggaranRemunerasiService.addAll(listVO, idLoginUser); if (CommonUtil.isNotNullOrEmpty(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); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when add master all anggaran remunerasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addAll", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add master all anggaran remunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -450,20 +434,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = indikatorKinerjaService.findAllIndikatorKinerja(idJenisIndikator, namaIndikator, statusVerifikasi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get master indikator kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllIndikatorKinerja", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get master indikator kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllIndikatorKinerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -496,17 +478,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = indikatorKinerjaService.findDuplicateIndikatorKinerja(idIndikator, namaIndikator); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get duplikat indikator kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findDuplicateIndikatorKinerja", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get duplikat indikator kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findDuplicateIndikatorKinerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -521,23 +502,22 @@ public class IkiDanRemunerasiController extends LocaleController result = indikatorKinerjaJabatanService.addAndUpdate(vo, idLoginUser); if (CommonUtil.isNotNullOrEmpty(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); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when add mapping indikator kinerja semua jabatan", + LOGGER.error("Got ServiceVOException {} when indikatorKinerjaJabatanService.addAndUpdate", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add mapping indikator kinerja semua jabatan", + LOGGER.error("Got JpaSystemException {} when indikatorKinerjaJabatanService.addAndUpdate", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -574,17 +552,16 @@ public class IkiDanRemunerasiController extends LocaleController result = indikatorKinerjaJabatanService.findAllByJabatan(idJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get mapping indikator jabatan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllByJabatan", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get mapping indikator jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllByJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -593,17 +570,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = indikatorKinerjaJabatanService.findAllByIndikator(idIndikator); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when set mapping indikator jabatan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllByIndikator", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when set mapping indikator jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllByIndikator", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -614,17 +590,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = indikatorKinerjaJabatanService.findDupMap(idIndikator, idJabatan, tglBerlaku); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get duplikat indikator jabatan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findDupMap", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get duplikat indikator jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findDupMap", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -639,20 +614,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanMedisService.findAllEnabled(listIdKelompokKerja, namaProduk, detailProduk, statusVerifikasi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get all skoring tindakan medis", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when skoringTindakanMedisService.findAllEnabled", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get all skoring tindakan medis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when skoringTindakanMedisService.findAllEnabled", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -685,17 +658,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanMedisService .findDaftarInputTindakanByRuanganKelas(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get daftar input tindakan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findDaftarInputTindakanByRuanganKelas", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get daftar input tindakan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findDaftarInputTindakanByRuanganKelas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -709,17 +681,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanMedisService.findDuplicateSkoring(namaProduk, idKelompokKerja, skor, detailProduk, tglMulaiBerlaku, noRec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get duplikat skoring tindakan medis", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findDuplicateSkoring", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get duplikat skoring tindakan medis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findDuplicateSkoring", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -728,17 +699,16 @@ public class IkiDanRemunerasiController extends LocaleController result = skoringTindakanMedisService.findAkses(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get akses skoring tindakan medis", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when skoringTindakanMedisService.findAkses", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get akses skoring tindakan medis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when skoringTindakanMedisService.findAkses", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -754,22 +724,21 @@ public class IkiDanRemunerasiController extends LocaleController setKontrakKinerja(HttpServletRequest request, @RequestBody Long bulan) { try { logbookKinerjaService.autoVerifKontrakJamKerjaDokter(new Date(bulan)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(true, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(true, CREATED, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when add/update set kontrak kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when autoVerifKontrakJamKerjaDokter", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add/update set kontrak kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when autoVerifKontrakJamKerjaDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -797,17 +765,16 @@ public class IkiDanRemunerasiController extends LocaleController result = logbookKinerjaService.findKontrakKinerja(idPegawai, idJabatan, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got ServiceVOException {} when get kontrak kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findKontrakKinerja", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get kontrak kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findKontrakKinerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -816,17 +783,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findKontrakKinerja(idIndikator); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when cek kontrak kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when cek kontrak kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -836,17 +802,16 @@ public class IkiDanRemunerasiController extends LocaleController listIdKelompokJabatan) { try { List> result = logbookKinerjaService.findAksesPegawai(idPegawai, listIdKelompokJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get pegawai akses kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when get pegawai akses kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -861,20 +826,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findPengajuanKontrakKinerja(idPegawai, idJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get daftar pengajuan kontrak kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get daftar pengajuan kontrak kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -906,17 +869,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = indikatorKinerjaJabatanService.findIndikatorByUnit(jenisIndikator, idUnitKerja, levelJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get daftar indikator di unit kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get daftar indikator di unit kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -927,17 +889,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findDupKontrakKinerja(idPegawai, idJabatan, bulan, idIndikator); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat kontrak kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat kontrak kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -952,20 +913,19 @@ public class IkiDanRemunerasiController extends LocaleController result = logbookKinerjaService.findLogbookKinerja(idPegawai, idJabatan, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get dashboard kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get dashboard kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -994,17 +953,16 @@ public class IkiDanRemunerasiController extends LocaleController result = logbookKinerjaService.findLogbookKinerja(idPegawai, null, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get widget dashboard kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get widget dashboard kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1013,17 +971,16 @@ public class IkiDanRemunerasiController extends LocaleController result = logbookKinerjaDetailService.findWidgetStatusVerifikasi(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get widget status verifikasi kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get widget status verifikasi kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1034,19 +991,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaDetailService.findWorkingRecord(idPegawai, idJabatan, bulan, false); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get catatan kegiatan harian belum verifikasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get catatan kegiatan harian belum verifikasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1057,19 +1013,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaDetailService.findWorkingRecord(idPegawai, idJabatan, bulan, true); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get catatan kegiatan harian sudah verifikasi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get catatan kegiatan harian sudah verifikasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1080,17 +1035,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaDetailService.findWorkingRecord(idPegawai, idJabatan, idIndikator, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get catatan kegiatan harian by indikator", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get catatan kegiatan harian by indikator", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1099,17 +1053,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaDetailService.findAksesPegawai(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get akses pegawai verifikasi kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get akses pegawai verifikasi kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1124,20 +1077,19 @@ public class IkiDanRemunerasiController extends LocaleController result = bobotJenisIndikatorService.addAll(vos); if (CommonUtil.isNotNullOrEmpty(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); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when add all bobot jenis indikator", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add all bobot jenis indikator", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1170,20 +1121,19 @@ public class IkiDanRemunerasiController extends LocaleController result = bobotJenisIndikatorService.updateAll(vos); if (CommonUtil.isNotNullOrEmpty(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); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when update all bobot jenis indikator", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update all bobot jenis indikator", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1193,17 +1143,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = bobotJenisIndikatorService.findAllBobotJenis(periode, idKelompokKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get master bobot jenis indikator", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get master bobot jenis indikator", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1212,17 +1161,16 @@ public class IkiDanRemunerasiController extends LocaleController result = bobotJenisIndikatorService.findBobotJenis(tglPembaharuanData); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get edit bobot jenis indikator", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get edit bobot jenis indikator", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1231,17 +1179,16 @@ public class IkiDanRemunerasiController extends LocaleController result = logbookKinerjaService.findBobotJenisJabatan(periode, idJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get bobot jenis indikator by jabatan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get bobot jenis indikator by jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1291,17 +1236,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = bobotJenisIndikatorService.findBobotJenis(periode, idJenisIndikator, idKelompokJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat bobot jenis indikator", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat bobot jenis indikator", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1310,17 +1254,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findLogbookJamKerjaDokter(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get logbook skoring dokter di jam kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get logbook skoring dokter di jam kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1334,19 +1277,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findDetailLogbookJamKerjaDokter(idPegawai, idIndikator, idProduk, tglPelayanan, idJenisPetugas, skor); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get detail pasien logbook skoring dokter di jam kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get detail pasien logbook skoring dokter di jam kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1355,19 +1297,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findLogbookLuarJamKerjaDokter(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get logbook skoring dokter di luar jam kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get logbook skoring dokter di luar jam kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1381,19 +1322,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findDetailLogbookLuarJamKerjaDokter(idPegawai, idIndikator, idProduk, tglPelayanan, idJenisPetugas, skor); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get detail pasien logbook skoring dokter di luar jam kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get detail pasien logbook skoring dokter di luar jam kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1403,17 +1343,16 @@ public class IkiDanRemunerasiController extends LocaleController result = logbookKinerjaService.findPenilaianKinerja(idPegawai, idJabatan, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get penilaian kinerja individu", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get penilaian kinerja individu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1426,19 +1365,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findRekapPenilaianKinerja(bulan, idUnitKerja, idSubunitKerja, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get rekapitulasi penilaian kinerja individu", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get rekapitulasi penilaian kinerja individu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1448,21 +1386,20 @@ public class IkiDanRemunerasiController extends LocaleController> result = mapPegawaiJabatanToUnitKerjaService.findPegawaiByUnitKerja(idUnitKerja, idSubunitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get akses pegawai verifikasi logbook dokter", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get akses pegawai verifikasi logbook dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1500,20 +1436,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanPerawatService.findAllEnabled(namaProduk, isVerif, kdKlasif); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get all skoring tindakan oleh perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get all skoring tindakan oleh perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1547,17 +1481,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanPerawatService.findDuplicateSkoring(namaProduk, skor, tglMulaiBerlaku, noRec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat skoring tindakan oleh perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat skoring tindakan oleh perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1566,17 +1499,16 @@ public class IkiDanRemunerasiController extends LocaleController result = skoringTindakanPerawatService.findAkses(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get akses skoring tindakan oleh perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get akses skoring tindakan oleh perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1591,22 +1523,21 @@ public class IkiDanRemunerasiController extends LocaleController> result = pelayananPasienPerawatService.findByAntrianPasienDiperiksa(noRec, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get pelayanan pasien oleh perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get pelayanan pasien oleh perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1660,20 +1589,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = produkPerawatService.findAllActive(namaProduk, kdKlasif); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get master produk perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get master produk perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1704,17 +1631,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = produkPerawatService.findDupProdukPerawat(namaProduk, kdKlasif, idProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat produk perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat produk perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1728,20 +1654,19 @@ public class IkiDanRemunerasiController extends LocaleController> getProfesiNakes(HttpServletRequest request) { try { List result = profesiService.findAllActive(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get master profesi nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get master profesi nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1774,20 +1698,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = produkNakesService.findProdukNakes(namaProduk, kdProduk, idProfesi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get master produk nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get master produk nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1818,17 +1740,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = produkNakesService.findDupProdukNakes(namaProduk, idProfesi, idProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat produk nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat produk nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1843,20 +1764,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanNakesService.findAllEnabled(namaProduk, isVerif, idProfesi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get all skoring tindakan oleh nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get all skoring tindakan oleh nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1890,19 +1809,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanNakesService.findDuplicateSkoring(namaProduk, skor, idProfesi, tglMulaiBerlaku, noRec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat skoring tindakan oleh nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat skoring tindakan oleh nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1911,17 +1829,16 @@ public class IkiDanRemunerasiController extends LocaleController result = skoringTindakanNakesService.findAkses(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get akses skoring tindakan oleh nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get akses skoring tindakan oleh nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -1936,24 +1853,23 @@ public class IkiDanRemunerasiController extends LocaleController> result = pelayananPasienNakesService.findByAntrianPasienDiperiksa(noRec, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get pelayanan pasien oleh nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get pelayanan pasien oleh nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2007,24 +1921,23 @@ public class IkiDanRemunerasiController extends LocaleController result = indeksKinerjaDokterService.addAll(vos); if (CommonUtil.isNotNullOrEmpty(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); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when add all indeks kinerja dokter", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add all indeks kinerja dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2076,20 +1987,19 @@ public class IkiDanRemunerasiController extends LocaleController> result = targetSkorDokterService.findAll(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get target skor kelompok kerja dokter", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get target skor kelompok kerja dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2145,17 +2053,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findLogbookNakes(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get logbook skoring nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get logbook skoring nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2166,17 +2073,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findDetailLogbookNakes(idPegawai, idProduk, tglPelayanan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get detail logbook skoring nakes lain", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get detail logbook skoring nakes lain", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2186,17 +2092,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanMedisService .findTindakanBelumAdaSkor(listIdKelompokKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get tindakan belum ada skor", sve.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get tindakan belum ada skor", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2207,17 +2112,16 @@ public class IkiDanRemunerasiController extends LocaleController result = skoringTindakanMedisService.findDeskripsiSkoringTindakanMedis(idProduk, idKelompokKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get deskripsi tindakan skor medis", sve.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get deskripsi tindakan skor medis", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2226,17 +2130,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanMedisService.findTindakanLogbookSkor(namaProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get tindakan logbook skor", sve.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get tindakan logbook skor", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2245,17 +2148,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findLogbookPerawat(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get logbook skoring perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get logbook skoring perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2266,17 +2168,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findDetailLogbookPerawat(idPegawai, idProduk, tglPelayanan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get detail logbook skoring perawat", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get detail logbook skoring perawat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2286,20 +2187,19 @@ public class IkiDanRemunerasiController extends LocaleController result = mapProdukKelompokKerjaService.addAll(vos); if (CommonUtil.isNotNullOrEmpty(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); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when add all mapping produk - kelompok kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add all mapping produk - kelompok kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2315,20 +2215,19 @@ public class IkiDanRemunerasiController extends LocaleController>> getSubjectMapProdukKelompokKerja(HttpServletRequest request) { try { List> result = mapProdukKelompokKerjaService.getAllProduk(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get subject map produk - kelompok kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get subject map produk - kelompok kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2374,17 +2271,16 @@ public class IkiDanRemunerasiController extends LocaleController> result = mapProdukKelompokKerjaService.getAllKelompokKerja(idProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get object map produk - kelompok kerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get object map produk - kelompok kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2399,22 +2295,21 @@ public class IkiDanRemunerasiController extends LocaleController> result = produkFarmakologiService.findProdukFarmakologi(namaProduk, kdProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get master produk kelompok kerja farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get master produk kelompok kerja farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2446,19 +2340,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = produkFarmakologiService.findDupProdukFarmakologi(namaProduk, idProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat produk kelompok kerja farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat produk kelompok kerja farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2473,22 +2366,21 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanFarmakologiService.findAllEnabled(namaProduk, isVerif); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get all skoring tindakan oleh kelompok kerja farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get all skoring tindakan oleh kelompok kerja farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2522,19 +2413,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = skoringTindakanFarmakologiService.findDuplicateSkoring(namaProduk, skor, tglMulaiBerlaku, noRec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get duplikat skoring tindakan oleh kelompok kerja farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get duplikat skoring tindakan oleh kelompok kerja farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2543,19 +2433,18 @@ public class IkiDanRemunerasiController extends LocaleController result = skoringTindakanFarmakologiService.findAkses(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get akses skoring tindakan oleh kelompok kerja farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get akses skoring tindakan oleh kelompok kerja farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2570,24 +2459,23 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findLogbookFarmakologi(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get logbook skoring dokter farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get logbook skoring dokter farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2636,19 +2522,18 @@ public class IkiDanRemunerasiController extends LocaleController> result = logbookKinerjaService.findDetailLogbookFarmakologi(idPegawai, idProduk, tglPelayanan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get detail logbook skoring dokter farmakologi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get detail logbook skoring dokter farmakologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -2658,22 +2543,21 @@ public class IkiDanRemunerasiController extends LocaleController dtoPage = logbookLogService.search(indikator, kegiatan, startDate, - endDate, pegawai, pageable); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(dtoPage, HttpStatus.OK, mapHeaderMessage); + Page dtoPage = logbookLogService.search(indikator, kegiatan, startDate, endDate, + pegawai, pageable); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(dtoPage, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get logging catatan kinerja", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get logging catatan kinerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IntegrationController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IntegrationController.java index 79f18830..15a14db7 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IntegrationController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IntegrationController.java @@ -1,29 +1,29 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.entities.PgStatActivity; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PgStatActivityService; -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.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +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("/integrasi") @@ -34,59 +34,61 @@ public class IntegrationController extends LocaleController { @Autowired private PgStatActivityService pgStatActivityService; - @RequestMapping(value = "/pg-stat-activity/in-state-for-minutes", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/pg-stat-activity/in-state-for-minutes", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPgStatActivityInStateForMinutes(HttpServletRequest request) { try { List result = pgStatActivityService.findByStateAndInterval(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get pg_stat_activity in state for minutes", e.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, e.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pgStatActivityService.findByStateAndInterval", e.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, e.getMessage()); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get pg_stat_activity in state for minutes", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pgStatActivityService.findByStateAndInterval", + jse.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonResponse(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/pg-stat-activity/cancel-backend", method = RequestMethod.POST) + @RequestMapping(value = "/pg-stat-activity/cancel-backend", method = POST) public ResponseEntity callPgCancelBackend(HttpServletRequest request, - @RequestParam(value = "pid", required = true) Integer pid) { + @RequestParam(value = "pid") Integer pid) { try { Boolean result = pgStatActivityService.callCancelBackend(pid); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when call pg_cancel_backend pid : {}", sve.getMessage(), pid); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, sve.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pgStatActivityService.callCancelBackend : {}", + sve.getMessage(), pid); + mapHeaderMessage.put(LABEL_SUCCESS, sve.getMessage()); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when call pg_cancel_backend pid : {}", jse.getMessage(), pid); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pgStatActivityService.callCancelBackend : {}", + jse.getMessage(), pid); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonResponse(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/pg-stat-activity/terminate-backend", method = RequestMethod.POST) + @RequestMapping(value = "/pg-stat-activity/terminate-backend", method = POST) public ResponseEntity callPgTerminateBackend(HttpServletRequest request, - @RequestParam(value = "pid", required = true) Integer pid) { + @RequestParam(value = "pid") Integer pid) { try { Boolean result = pgStatActivityService.callTerminateBackend(pid); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when call pg_terminate_backend pid : {}", sve.getMessage(), pid); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, sve.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pgStatActivityService.callTerminateBackend : {}", + sve.getMessage(), pid); + mapHeaderMessage.put(LABEL_SUCCESS, sve.getMessage()); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when call pg_terminate_backend pid : {}", jse.getMessage(), pid); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pgStatActivityService.callTerminateBackend : {}", + jse.getMessage(), pid); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonResponse(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java index 6ab6ff40..1558f1a8 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java @@ -1,36 +1,35 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.ArrayList; -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.JabatanService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.JabatanVO; 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.JabatanService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.JabatanVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_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.*; +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("/jabatan") @@ -41,137 +40,125 @@ public class JabatanController extends LocaleController { @Autowired private JabatanService jabatanService; - @RequestMapping(value = "/save-jabatan-internal/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jabatan-internal/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody JabatanVO vo, HttpServletRequest request) { try { - Map result = jabatanService.saveJabatan(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result.toString(), HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("New jabatan successfully created", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/update-jabatan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-jabatan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity editVO(@Valid @RequestBody JabatanVO vo) { try { - JabatanVO result = (JabatanVO) jabatanService.update(vo); - + JabatanVO result = jabatanService.update(vo); if (null != result) - return RestUtil.getJsonResponse("", HttpStatus.OK); + return getJsonResponse("Jabatan successfully updated", OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Agama", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when jabatanService.update", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Agama", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when jabatanService.update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - @RequestMapping(value = "/update-jabatan-false/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-jabatan-false/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity editFalseVO(@Valid @RequestBody JabatanVO vo) { try { - JabatanVO result = (JabatanVO) jabatanService.deleteJabatan(vo); - + JabatanVO result = jabatanService.deleteJabatan(vo); if (null != result) - return RestUtil.getJsonResponse("", HttpStatus.OK); + return getJsonResponse("Jabatan successfully updated", OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Agama", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deleteJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Agama", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deleteJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - @RequestMapping(value = "/delete-jabatan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteVO(@RequestParam(value = "id", required = true) Integer id, - HttpServletRequest request) { + @RequestMapping(value = "/delete-jabatan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity deleteVO(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { boolean result = jabatanService.delete(id); - - return RestUtil.getJsonResponse(String.valueOf(result), HttpStatus.CREATED); - + if (result) + return getJsonResponse("Jabatan successfully deleted"); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete Jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when jabatanService.delete", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete Jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when jabatanService.delete", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } + return getJsonHttpStatus(NOT_ACCEPTABLE); } - @RequestMapping(value = "/save-master-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-master-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveJabatan(HttpServletRequest request, @Valid @RequestBody JabatanVO vo) { try { - JabatanVO result = new JabatanVO(); + JabatanVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = jabatanService.update(vo); } else { result = jabatanService.add(vo); } if (CommonUtil.isNotNullOrEmpty(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); } else { - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when add/update master jabatan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when jabatanService add/update", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add/update master jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when jabatanService add/update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-master-jabatan", method = RequestMethod.GET) + @RequestMapping(value = "/get-master-jabatan", method = GET) public ResponseEntity>> getMasterJabatan(HttpServletRequest request, @RequestParam(value = "namaJabatan", required = false) String namaJabatan, @RequestParam(value = "jenisJabatanId", required = false) Integer idJenisJabatan, - @RequestParam(value = "unitKerjaId", required = false) Integer idUnitKerja) throws ParseException { + @RequestParam(value = "unitKerjaId", required = false) Integer idUnitKerja) { try { List> result = jabatanService.findJabatan(namaJabatan, idJenisJabatan, idUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when get master jabatan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findJabatan", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get master jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/search-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/search-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @@ -179,116 +166,103 @@ public class JabatanController extends LocaleController { @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { Map resultPageMap = jabatanService.findAllWithPageAndLimitAndSortByAndDirectionParameter(page, limit, sort, dir); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/get-all-jabatan-struktural", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-jabatan-struktural", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllJabatanStruktural(HttpServletRequest request) { - List> result = null; try { - - result = jabatanService.getJabatanStruktural(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = jabatanService.getJabatanStruktural(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/get-list-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllJabatanByJenisJabatan(HttpServletRequest request, - @RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan) { - List> result = new ArrayList>(); + @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan) { try { - - result = jabatanService.findModelJabatan(idJenisJabatan); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = jabatanService.findModelJabatan(idJenisJabatan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/validate-nama-jabatan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/validate-nama-jabatan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> validateNamaJabatan(HttpServletRequest request, @RequestParam(value = "idJabatan", required = false) Integer idJabatan, - @RequestParam(value = "namaJabatan", required = true) String namaJabatan, - @RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan, + @RequestParam(value = "namaJabatan") String namaJabatan, + @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja) { try { Map result = jabatanService.validateNamaJabatan(idJabatan, namaJabatan, idJenisJabatan, idUnitKerja); - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when validate nama jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when validateNamaJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when validate nama jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when validateNamaJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaiByJabatan(HttpServletRequest request, - @RequestParam(value = "jabatanId", required = true) Integer idJabatan) { + @RequestParam(value = "jabatanId") Integer idJabatan) { try { List> result = jabatanService.findPegawaiByJabatan(idJabatan); - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get pegawai jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPegawaiByJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get pegawai jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiByJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-jabatan-dan-batas-nilai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jabatan-dan-batas-nilai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanDanBatasNilai(HttpServletRequest request, - @RequestParam(value = "jenisJabatanId", required = true) Integer idJenisJabatan, - @RequestParam(value = "unitKerjaId", required = true) Integer idUnitKerja) { + @RequestParam(value = "jenisJabatanId") Integer idJenisJabatan, + @RequestParam(value = "unitKerjaId") Integer idUnitKerja) { try { List> result = jabatanService.findJabatanDanBatasNilai(idJenisJabatan, idUnitKerja); - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get jabatan dan batas nilai jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findJabatanDanBatasNilai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get jabatan dan batas nilai jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findJabatanDanBatasNilai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-by-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-by-unit-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getByUnitKerja(HttpServletRequest request, - @RequestParam(value = "unitKerjaId", required = true) Integer idUnitKerja) { + @RequestParam(value = "unitKerjaId") Integer idUnitKerja) { try { List> result = jabatanService.findByUnitKerja(idUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get jabatan by unit kerja", e.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, e.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when get jabatanService.findByUnitKerja", e.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, e.getMessage()); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get jabatan by unit kerja", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when get jabatanService.findByUnitKerja", jse.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonResponse(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java index 4e41adbd..6457c2c8 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java @@ -1,31 +1,29 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.KeluargaPegawaiService; +import com.jasamedika.medifirst2000.vo.KeluargaPegawaiVO; 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.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.KeluargaPegawaiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.KeluargaPegawaiVO; +import javax.validation.Valid; +import java.util.List; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +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; /** * Controller class for KeluargaPegawaiController @@ -36,89 +34,47 @@ import com.jasamedika.medifirst2000.vo.KeluargaPegawaiVO; */ @RestController @RequestMapping("/keluarga-pegawai") -public class KeluargaPegawaiController extends - LocaleController implements - IBaseRestController { +public class KeluargaPegawaiController extends LocaleController { @Autowired private KeluargaPegawaiService keluargaPegawaiService; - private static final Logger LOGGER = LoggerFactory - .getLogger(KeluargaPegawaiController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(KeluargaPegawaiController.class); - @RequestMapping(value = "/cari-alamat-id/{id}", method = RequestMethod.GET) - public ResponseEntity getVO( - @PathVariable("id") Integer id) { - KeluargaPegawaiVO keluargaPegawaiVO = keluargaPegawaiService - .findById(id); + @RequestMapping(value = "/cari-alamat-id/{id}", method = GET) + public ResponseEntity getVO(@PathVariable("id") Integer id) { + KeluargaPegawaiVO keluargaPegawaiVO = keluargaPegawaiService.findById(id); - return RestUtil.getJsonResponse(keluargaPegawaiVO, HttpStatus.OK); - } - @RequestMapping(value = "/get-all/", method = RequestMethod.GET) - public ResponseEntity getAllKeluaraPegawai( - @PathVariable("id") Integer id) { - List keluargaPegawaiVO = keluargaPegawaiService - .findAll(); - - return RestUtil.getJsonResponse(keluargaPegawaiVO, HttpStatus.OK); + return getJsonResponse(keluargaPegawaiVO, OK); } - @RequestMapping(value = "/cari-alamat-by-pasien-id/{id}", method = RequestMethod.GET) - public ResponseEntity getByPasienVO( - @PathVariable("id") Integer id) { - KeluargaPegawaiVO keluargaPegawaiVO = keluargaPegawaiService - .findById(id); - - return RestUtil.getJsonResponse(keluargaPegawaiVO, HttpStatus.OK); + @RequestMapping(value = "/get-all/", method = GET) + public ResponseEntity> getAllKeluaraPegawai(@PathVariable("id") Integer id) { + List keluargaPegawaiVO = keluargaPegawaiService.findAll(); + return getJsonResponse(keluargaPegawaiVO, OK); } - @Override - public ResponseEntity> getAllVOWithQueryString( - HttpServletRequest request, Integer page, Integer limit, - String sort, String dir) { - return null; + @RequestMapping(value = "/cari-alamat-by-pasien-id/{id}", method = GET) + public ResponseEntity getByPasienVO(@PathVariable("id") Integer id) { + KeluargaPegawaiVO keluargaPegawaiVO = keluargaPegawaiService.findById(id); + return getJsonResponse(keluargaPegawaiVO, OK); } - - @RequestMapping(value = "/save-keluarga-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-keluarga-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody KeluargaPegawaiVO vo) { try { KeluargaPegawaiVO result = keluargaPegawaiService.add(vo); - if (null != result) - return RestUtil.getJsonResponse("Success", HttpStatus.CREATED); - + return getJsonResponse("Success", CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when keluargaPegawaiService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when keluargaPegawaiService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - - @Override - public ResponseEntity editVO(KeluargaPegawaiVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - @Override - public ResponseEntity> getAllVO() { - return null; - } - - - - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java index b0d5405d..0ba16c3b 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java @@ -1,38 +1,35 @@ package com.jasamedika.medifirst2000.controller; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.KonsultasiService; +import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; +import com.jasamedika.medifirst2000.vo.KonsultasiVO; +import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; +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.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.util.Collection; import java.util.List; import java.util.Map; -import 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.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.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.KonsultasiService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.KonsultasiVO; +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.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; /** * Controller class for KonsultasiController @@ -41,46 +38,42 @@ import com.jasamedika.medifirst2000.vo.KonsultasiVO; */ @RestController @RequestMapping("/konsultasi") -@JsonIgnoreProperties(ignoreUnknown = true) -public class KonsultasiController extends LocaleController implements - IBaseRestController { - +@JsonIgnoreProperties(ignoreUnknown = true) +public class KonsultasiController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(KonsultasiController.class); @Autowired - private KonsultasiService konsultasiService; + private KonsultasiService konsultasiService; @Autowired - private RegistrasiPelayananService registrasiPelayananService; + private RegistrasiPelayananService registrasiPelayananService; - @RequestMapping(value = "/save-konsultasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody KonsultasiVO vo,HttpServletRequest request) { + @RequestMapping(value = "/save-konsultasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody KonsultasiVO vo, HttpServletRequest request) { try { - Map result = konsultasiService.addKonsultasi2(vo); - if (null != result){ - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }else{ - mapHeaderMessage.clear(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); + Map result = konsultasiService.addKonsultasi(vo); + mapHeaderMessage.clear(); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - SaveLog("Konsultasi", "Dokter",request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - + saveLog("Konsultasi", "Dokter"); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add kebutuhan dasar", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addKonsultasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add kebutuhan dasar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addKonsultasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/antrian-pasien-list-konsul/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryString( + + @RequestMapping(value = "/antrian-pasien-list-konsul/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -90,73 +83,34 @@ public class KonsultasiController extends LocaleController impleme @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { - Map resultPageMap = registrasiPelayananService.findAllAntrianPagingKonsultasi(page, limit, sort, dir, - ruanganId, dateStart, dateEnd, noCm, pegawaiId); - + Map resultPageMap = registrasiPelayananService.findAllAntrianPagingKonsultasi(page, limit, sort, + dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); return constructListPageResult(resultPageMap); } - @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(KonsultasiVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(KonsultasiVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value = "/get-riwayat-konsultasi/{noCm}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getRiwayatKonsultasi(@PathVariable("noCm") String noCm,@PathVariable("startDate") String startDate, - @PathVariable("endDate") String endDate,HttpServletRequest request) { - List> result = null; + @RequestMapping(value = "/get-riwayat-konsultasi/{noCm}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getRiwayatKonsultasi(@PathVariable("noCm") String noCm, + @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, + HttpServletRequest request) { try { - - result = konsultasiService.getRiwayatKonsultasi(noCm, startDate, endDate); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = konsultasiService.getRiwayatKonsultasi(noCm, startDate, endDate); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - - @RequestMapping(value = "/get-konsultasi-kosong", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-konsultasi-kosong", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getKonsultasiKosong(HttpServletRequest request, - @RequestParam(value = "tglAwal", required = true) String strTglAwal, - @RequestParam(value = "tglAkhir", required = true) String strTglAkhir) { - List> result = null; + @RequestParam(value = "tglAwal") String strTglAwal, @RequestParam(value = "tglAkhir") String strTglAkhir) { try { - - result = konsultasiService.findAllKonsultasiTindakanKosong(strTglAwal, strTglAkhir); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + List> result = konsultasiService.findAllKonsultasiTindakanKosong(strTglAwal, + strTglAkhir); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/LogbookRemunController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/LogbookRemunController.java index 93c3747b..b9a8216f 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/LogbookRemunController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/LogbookRemunController.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest; 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.getJsonHttptatus; +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.ACCEPTED; @@ -47,7 +47,7 @@ public class LogbookRemunController extends LocaleController { } catch (ServiceVOException | JpaSystemException e) { LOGGER.error("Got Exception {} when generateRecap", e.getMessage()); mapHeaderMessage.put(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java index 45a7aca7..5160745b 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java @@ -1,20 +1,14 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.Master; 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.PegawaiJabatanDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MapPegawaiJabatanToUnitKerjaVO; 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.*; @@ -22,66 +16,72 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.text.ParseException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.constants.Master.TIDAK_ADA_PERUBAHAN_DATA; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK; +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("/map-pegawai-jabatan-unitkerja") public class MapPegawaiJabatanToUnitKerjaController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(MapPegawaiJabatanToUnitKerjaController.class); + @Autowired private MapPegawaiJabatanToUnitKerjaService mapPegawaiJabatanToUnitKerjaService; - private static final Logger LOGGER = LoggerFactory.getLogger(MapPegawaiJabatanToUnitKerjaController.class); - - @RequestMapping(value = "/save-map", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-map", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> save(@Valid @RequestBody List vo, HttpServletRequest request) throws ParseException { try { Map result = mapPegawaiJabatanToUnitKerjaService.saveRev(vo); - if (null != result && result.get("data").equals(Master.TIDAK_ADA_PERUBAHAN_DATA)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK, - getMessage(MessageResource.LABEL_SUCCESS_OK, request)); - return RestUtil.getJsonResponse(result, HttpStatus.NOT_MODIFIED, mapHeaderMessage); + if (null != result && result.get("data").equals(TIDAK_ADA_PERUBAHAN_DATA)) { + mapHeaderMessage.put(LABEL_SUCCESS_OK, getMessage(MessageResource.LABEL_SUCCESS_OK, request)); + return getJsonResponse(result, NOT_MODIFIED, mapHeaderMessage); } else { - 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 mapping jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when mapPegawaiJabatanToUnitKerjaService.saveRev", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add mapping jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when mapPegawaiJabatanToUnitKerjaService.saveRev", + jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/hapus-map", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/hapus-map", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> hapusMap(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { - Map mapHeaderMessage = new HashMap(); + HttpServletRequest request) { + Map mapHeaderMessage = new HashMap<>(); try { Map result = mapPegawaiJabatanToUnitKerjaService.save(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Map", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when mapPegawaiJabatanToUnitKerjaService.save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Map", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when mapPegawaiJabatanToUnitKerjaService.save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } /** @@ -89,291 +89,271 @@ public class MapPegawaiJabatanToUnitKerjaController extends LocaleController> getAllMap(HttpServletRequest request) { - Map result = null; try { - result = mapPegawaiJabatanToUnitKerjaService.findAllMap(); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + Map result = mapPegawaiJabatanToUnitKerjaService.findAllMap(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/get-map-by-pegawai/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/get-map-by-pegawai/{id}", method = GET) public ResponseEntity>> getMapByPegawai(@PathVariable("id") Integer id) { - List> result = new ArrayList>(); try { - result = mapPegawaiJabatanToUnitKerjaService.findAllDetailByPegawai(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + List> result = mapPegawaiJabatanToUnitKerjaService.findAllDetailByPegawai(id); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get mapping jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllDetailByPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get mapping jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllDetailByPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-bawahan-level-jabatan", method = RequestMethod.GET) + @RequestMapping(value = "/get-bawahan-level-jabatan", method = GET) public ResponseEntity>> getBawahanByLevelJabatan(HttpServletRequest request, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai) { - List> result = new ArrayList>(); + @RequestParam(value = "idPegawai") Integer idPegawai) { try { - result = mapPegawaiJabatanToUnitKerjaService.findAllDetailByLevelJabatan(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + List> result = mapPegawaiJabatanToUnitKerjaService + .findAllDetailByLevelJabatan(idPegawai); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get bawahan by level jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllDetailByLevelJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get bawahan by level jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllDetailByLevelJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-undefined-bawahan", method = RequestMethod.GET) + @RequestMapping(value = "/get-undefined-bawahan", method = GET) public ResponseEntity>> getUndefinedBawahan(HttpServletRequest request) { - List> result = new ArrayList>(); try { - result = mapPegawaiJabatanToUnitKerjaService.findAllUndefinedDetail(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + List> result = mapPegawaiJabatanToUnitKerjaService.findAllUndefinedDetail(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get bawahan belum didefinisikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllUndefinedDetail", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get bawahan belum didefinisikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllUndefinedDetail", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-sub-unit-by-unit/{id}/{idUnit}", method = RequestMethod.GET) + @RequestMapping(value = "/get-sub-unit-by-unit/{id}/{idUnit}", method = GET) public ResponseEntity> getSubUnitByUnit(@PathVariable("id") Integer id, @PathVariable("idUnit") Integer idUnit) { - return RestUtil.getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findSubUnitByUnit(id, idUnit), - HttpStatus.OK); + return getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findSubUnitByUnit(id, idUnit), OK); } - @RequestMapping(value = "/get-unit-by-pegawai/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/get-unit-by-pegawai/{id}", method = GET) public ResponseEntity> getSubUnitByUnit(@PathVariable("id") Integer id) { - return RestUtil.getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findUnitByPgw(id), HttpStatus.OK); + return getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findUnitByPgw(id), OK); } - @RequestMapping(value = "/get-unit-by-pegawai-jadwal/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/get-unit-by-pegawai-jadwal/{id}", method = GET) public ResponseEntity>> getSubUnitByUnitJadwal(@PathVariable("id") Integer id) { - return RestUtil.getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findUnitByPgwJadwal(id), HttpStatus.OK); + return getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findUnitByPgwJadwal(id), OK); } - @RequestMapping(value = "/get-sub-unit-by-unit-jadwal/{id}/{idUnit}", method = RequestMethod.GET) + @RequestMapping(value = "/get-sub-unit-by-unit-jadwal/{id}/{idUnit}", method = GET) public ResponseEntity>> getSubUnitByUnitJadwal(@PathVariable("id") Integer id, @PathVariable("idUnit") Integer idUnit) { - return RestUtil.getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findSubUnitByUnitJadwal(id, idUnit), - HttpStatus.OK); + return getJsonResponse(mapPegawaiJabatanToUnitKerjaService.findSubUnitByUnitJadwal(id, idUnit), OK); } - @RequestMapping(value = "/get-status-create-jadwal", method = RequestMethod.GET) + @RequestMapping(value = "/get-status-create-jadwal", method = GET) public ResponseEntity> getStatusCreateJadwal( @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { try { Map result = mapPegawaiJabatanToUnitKerjaService .getMapJabatanForMonitoringAbsensiByPegawai(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get status create jadwal", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getMapJabatanForMonitoringAbsensiByPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get status create jadwal", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getMapJabatanForMonitoringAbsensiByPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-drop-down-unit", method = RequestMethod.GET) + @RequestMapping(value = "/get-drop-down-unit", method = GET) public ResponseEntity> getDropDownUnitKerja( @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { Map result = new HashMap<>(); try { result.put("data", mapPegawaiJabatanToUnitKerjaService.getMapUnitKerjaByPegawai(id)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get drop down unit", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getMapUnitKerjaByPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get drop down unit", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getMapUnitKerjaByPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-drop-down-subunit", method = RequestMethod.GET) + @RequestMapping(value = "/get-drop-down-subunit", method = GET) public ResponseEntity> getDropDownSubUnitKerja( @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "idUnit", required = false) Integer idUnit, HttpServletRequest request) { Map result = new HashMap<>(); try { result.put("data", mapPegawaiJabatanToUnitKerjaService.getMapSubunitKerjaByUnitPegawai(id, idUnit)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get drop down subunit", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getMapSubunitKerjaByUnitPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get drop down subunit", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getMapSubunitKerjaByUnitPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/list-atasan-langsung-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/list-atasan-langsung-pegawai", method = GET) public ResponseEntity> getAtasanLangsungPegawai( @RequestParam(value = "idPegawai", required = false) Integer idPegawai, HttpServletRequest request) { Map result = new HashMap<>(); try { result.put("data", mapPegawaiJabatanToUnitKerjaService.findAtasanLangsungPegawai(idPegawai)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get drop down list atasan langsung", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAtasanLangsungPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get drop down list atasan langsung", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAtasanLangsungPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/list-pejabat-penilai-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/list-pejabat-penilai-pegawai", method = GET) public ResponseEntity> getAtasanPejabatPenilaiPegawai( @RequestParam(value = "idPegawai", required = false) Integer idPegawai, HttpServletRequest request) { Map result = new HashMap<>(); try { result.put("data", mapPegawaiJabatanToUnitKerjaService.findPejabatPenilaiPegawai(idPegawai)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get drop down list atasan pejabat penilai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPejabatPenilaiPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get drop down list atasan pejabat penilai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPejabatPenilaiPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-formasi-jabatan", method = RequestMethod.GET) + @RequestMapping(value = "/get-formasi-jabatan", method = GET) public ResponseEntity>> getFormasiJabatan(HttpServletRequest request) { - List> result = new ArrayList>(); try { - result = mapPegawaiJabatanToUnitKerjaService.findFormasiJabatan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + List> result = mapPegawaiJabatanToUnitKerjaService.findFormasiJabatan(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get formasi jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findFormasiJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get formasi jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findFormasiJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-jabatan-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-jabatan-pegawai", method = GET) public ResponseEntity>> getJabatanPegawai(HttpServletRequest request) { - List> result = new ArrayList>(); try { - result = mapPegawaiJabatanToUnitKerjaService.getJabatanPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + List> result = mapPegawaiJabatanToUnitKerjaService.getJabatanPegawai(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get jabatan pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getJabatanPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get jabatan pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getJabatanPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-evaluasi-jabatan-pegawai-baru", method = RequestMethod.GET) + @RequestMapping(value = "/get-evaluasi-jabatan-pegawai-baru", method = GET) public ResponseEntity> getEvaluasiJabatanPegawaiBaru( @RequestParam(value = "listJabatanId", required = false) List listIdJabatan, HttpServletRequest request) { Map result = new HashMap<>(); try { result.put("data", mapPegawaiJabatanToUnitKerjaService.getEvaluasiJabatanPegawaiBaru(listIdJabatan)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get evaluasi jabatan pegawai baru", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getEvaluasiJabatanPegawaiBaru", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get evaluasi jabatan pegawai baru", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getEvaluasiJabatanPegawaiBaru", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/pegawai/{unitKerjaId}", method = RequestMethod.GET) + @RequestMapping(value = "/pegawai/{unitKerjaId}", method = GET) public ResponseEntity>> getPegawaiByUnitKerja(@PathVariable Integer unitKerjaId, HttpServletRequest request) { try { List> result = mapPegawaiJabatanToUnitKerjaService .getlistPegawaiByUnitKerja(unitKerjaId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get jabatan pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getlistPegawaiByUnitKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get jabatan pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getlistPegawaiByUnitKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/logbook-title/{idPegawai}", method = RequestMethod.GET) + @RequestMapping(value = "/logbook-title/{idPegawai}", method = GET) public ResponseEntity logbookTitle(@PathVariable("idPegawai") Integer idPegawai) { String jenisLogbook = mapPegawaiJabatanToUnitKerjaService.getJenisLogbook(idPegawai); - return RestUtil.getJsonResponse(jenisLogbook, HttpStatus.OK); + return getJsonResponse(jenisLogbook, OK); } - @RequestMapping(value = "/jabatan/{idPegawai}", method = RequestMethod.GET) + @RequestMapping(value = "/jabatan/{idPegawai}", method = GET) public ResponseEntity pegawaiJabatan(@PathVariable("idPegawai") Integer idPegawai) { PegawaiJabatanDto dataJabatan = mapPegawaiJabatanToUnitKerjaService.getDataJabatan(idPegawai); - return RestUtil.getJsonResponse(dataJabatan, HttpStatus.OK); + return getJsonResponse(dataJabatan, OK); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java index 5ab799de..b13353b5 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java @@ -1,288 +1,270 @@ package com.jasamedika.medifirst2000.controller; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.dto.FileUploadExcelDto; +import com.jasamedika.medifirst2000.dto.PayRollDto; +import com.jasamedika.medifirst2000.dto.PayRollUangMakanDto; +import com.jasamedika.medifirst2000.service.PayRollPegawaiService; +import com.jasamedika.medifirst2000.vo.StrukHistoriVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -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.FileUploadExcelDto; -import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto; -import com.jasamedika.medifirst2000.dto.PayRollDto; -import com.jasamedika.medifirst2000.dto.PayRollUangMakanDto; -import com.jasamedika.medifirst2000.service.PayRollPegawaiService; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.DateUtil.toDate; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.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(value="/pay-roll") +@RequestMapping(value = "/pay-roll") public class PayRollPegawaiController extends LocaleController { - + @Autowired private PayRollPegawaiService payRollPegawaiService; - @RequestMapping(value="/get-pegawai-blu-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-blu-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> prosesPegawaiBluPkwt( - @RequestParam(value="idKategoryPegawai", required = true) Integer idKategoryPegawai, - @RequestParam(value="idJenisGaji" , required = true) Integer idJenisGaji, - @RequestParam(value="periode", required = true) String periode, - @RequestParam(value="tglHistori", required = false) String tglHistori, - HttpServletRequest request) { - List> result = payRollPegawaiService.prosesPegawaiBluPkwt(idKategoryPegawai,idJenisGaji,periode,DateUtil.toDate(tglHistori)); - + @RequestParam(value = "idKategoryPegawai") Integer idKategoryPegawai, + @RequestParam(value = "idJenisGaji") Integer idJenisGaji, @RequestParam(value = "periode") String periode, + @RequestParam(value = "tglHistori", required = false) String tglHistori, HttpServletRequest request) { + List> result = payRollPegawaiService.prosesPegawaiBluPkwt(idKategoryPegawai, idJenisGaji, + periode, toDate(tglHistori)); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-pegawai-blu-pkwt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai-blu-pkwt", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> savePegawaiByStatusPegawai(@RequestBody List dtos, HttpServletRequest request) { List result = payRollPegawaiService.save(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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/find-status-pegawai-blu-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-status-pegawai-blu-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findPegawaiBluPkwt(HttpServletRequest request) { - List ids=new ArrayList(); + List ids = new ArrayList<>(); ids.add(9); ids.add(10); List> result = payRollPegawaiService.findDetailKategoryPegawaiBluPkwt(ids); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/find-jenis-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-jenis-gaji", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findJenisGaji(HttpServletRequest request) { List> result = payRollPegawaiService.findAllJenisGaji(); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/get-uang-makan-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-uang-makan-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> prosesUangMakanPegawai( - @RequestParam(value="idKategoryPegawai", required = true) Integer idKategoryPegawai, - @RequestParam(value="idJenisGaji" , required = true) Integer idJenisGaji, - @RequestParam(value="periode", required = true) String periode, - @RequestParam(value="tglHistori", required = false) String tglHistori, - HttpServletRequest request) { - List> result = payRollPegawaiService.prosesUangMakanPegawai(idKategoryPegawai,idJenisGaji,periode,"uangmakan",DateUtil.toDate(tglHistori)); - + @RequestParam(value = "idKategoryPegawai") Integer idKategoryPegawai, + @RequestParam(value = "idJenisGaji") Integer idJenisGaji, @RequestParam(value = "periode") String periode, + @RequestParam(value = "tglHistori", required = false) String tglHistori, HttpServletRequest request) { + List> result = payRollPegawaiService.prosesUangMakanPegawai(idKategoryPegawai, idJenisGaji, + periode, "uangmakan", toDate(tglHistori)); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/find-status-pegawai-uang-makan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-status-pegawai-uang-makan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findPegawaiUangMakan(HttpServletRequest request) { - List ids=new ArrayList(); + List ids = new ArrayList<>(); ids.add(9); ids.add(10); ids.add(18); ids.add(19); List> result = payRollPegawaiService.findDetailKategoryPegawaiBluPkwt(ids); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-pegawai-uang-makan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai-uang-makan", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> savePegawaiUangMakan(@RequestBody List dtos, HttpServletRequest request) { - List result = payRollPegawaiService.saveUangMakan(dtos,"uangmakan"); + List result = payRollPegawaiService.saveUangMakan(dtos, "uangmakan"); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/import-uang-makan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/import-uang-makan", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> importUangMakan( - @RequestParam(value="idKategoryPegawai", required = false) Integer idKategoryPegawai, - @RequestParam(value="idJenisGaji" , required = false) Integer idJenisGaji, - @RequestParam(value="periode", required = false) String periode, - @RequestParam(value="file",required = false) String file, - @RequestParam(value="tglHistori", required = false) String tglHistori,@RequestBody FileUploadExcelDto dto, - HttpServletRequest request) { - List result = payRollPegawaiService.importUangMakan(idKategoryPegawai,idJenisGaji,periode,file,DateUtil.toDate(tglHistori),dto); + @RequestParam(value = "idKategoryPegawai", required = false) Integer idKategoryPegawai, + @RequestParam(value = "idJenisGaji", required = false) Integer idJenisGaji, + @RequestParam(value = "periode", required = false) String periode, + @RequestParam(value = "file", required = false) String file, + @RequestParam(value = "tglHistori", required = false) String tglHistori, + @RequestBody FileUploadExcelDto dto, HttpServletRequest request) { + List result = payRollPegawaiService.importUangMakan(idKategoryPegawai, idJenisGaji, + periode, file, toDate(tglHistori), dto); if (result != null) { if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data"); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_ERROR, "Processing data error returns empty data"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - } - @RequestMapping(value="/find-status-pegawai-harianLepas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-status-pegawai-harianLepas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findPegawaiHarianLepas(HttpServletRequest request) { - List ids=new ArrayList(); + List ids = new ArrayList<>(); ids.add(13); List> result = payRollPegawaiService.findDetailKategoryPegawaiBluPkwt(ids); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-harian-lepas-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-harian-lepas-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> prosesPegawaiHarianLepas( - @RequestParam(value="idKategoryPegawai", required = true) Integer idKategoryPegawai, - @RequestParam(value="idJenisGaji" , required = true) Integer idJenisGaji, - @RequestParam(value="periode", required = true) String periode, - @RequestParam(value="tglHistori", required = false) String tglHistori, - HttpServletRequest request) { - List> result = payRollPegawaiService.prosesUangMakanPegawai(idKategoryPegawai,idJenisGaji,periode,"harianlepas",DateUtil.toDate(tglHistori)); - + @RequestParam(value = "idKategoryPegawai") Integer idKategoryPegawai, + @RequestParam(value = "idJenisGaji") Integer idJenisGaji, @RequestParam(value = "periode") String periode, + @RequestParam(value = "tglHistori", required = false) String tglHistori, HttpServletRequest request) { + List> result = payRollPegawaiService.prosesUangMakanPegawai(idKategoryPegawai, idJenisGaji, + periode, "harianlepas", toDate(tglHistori)); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-pegawai-harian-lepas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai-harian-lepas", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveHarianLepas(@RequestBody List dtos, HttpServletRequest request) { - List result = payRollPegawaiService.saveUangMakan(dtos,"harianlepas"); + List result = payRollPegawaiService.saveUangMakan(dtos, "harianlepas"); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - @RequestMapping(value="/find-status-pegawai-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-status-pegawai-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findPegawaiDokterPsikologiPkwt(HttpServletRequest request) { - List ids=new ArrayList(); + List ids = new ArrayList<>(); ids.add(10); List> result = payRollPegawaiService.findDetailKategoryPegawaiBluPkwt(ids); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-dokter-psikologi-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-dokter-psikologi-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> prosesDokterPsikologiPkwt( - @RequestParam(value="idKategoryPegawai", required = true) Integer idKategoryPegawai, - @RequestParam(value="idJenisGaji" , required = true) Integer idJenisGaji, - @RequestParam(value="periode", required = true) String periode, - @RequestParam(value="tglHistori", required = false) String tglHistori, - HttpServletRequest request) { - List> result = payRollPegawaiService.prosesDokterPsikologiPkwt(idKategoryPegawai,idJenisGaji,periode,DateUtil.toDate(tglHistori)); - + @RequestParam(value = "idKategoryPegawai") Integer idKategoryPegawai, + @RequestParam(value = "idJenisGaji") Integer idJenisGaji, @RequestParam(value = "periode") String periode, + @RequestParam(value = "tglHistori", required = false) String tglHistori, HttpServletRequest request) { + List> result = payRollPegawaiService.prosesDokterPsikologiPkwt(idKategoryPegawai, + idJenisGaji, periode, toDate(tglHistori)); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-dokter-psikologi-pkwt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDokterPsikologiPkwt(@RequestBody List dtos, - HttpServletRequest request) { - List result = payRollPegawaiService.saveUangMakan(dtos,"tunjanganlayanan"); + @RequestMapping(value = "/save-dokter-psikologi-pkwt", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDokterPsikologiPkwt( + @RequestBody List dtos, HttpServletRequest request) { + List result = payRollPegawaiService.saveUangMakan(dtos, "tunjanganlayanan"); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/find-rekanan-penjamin-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-rekanan-penjamin-pasien", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findRekananPenjaminPasien(HttpServletRequest request) { List> result = payRollPegawaiService.findRekananPenjaminPasien(); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/find-umr", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findUmr( - @RequestParam(value="periode", required = true) String periode, + @RequestMapping(value = "/find-umr", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> findUmr(@RequestParam(value = "periode") String periode, HttpServletRequest request) { Map result = payRollPegawaiService.findUmr(periode); - 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/get-premi-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-premi-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> prosesPremiAsuransi( - @RequestParam(value="idJenisGaji" , required = true) Integer idJenisGaji, - @RequestParam(value="periode", required = true) String periode, - @RequestParam(value="idRekanan" , required = true) Integer idRekanan, - @RequestParam(value="tglHistori", required = false) String tglHistori, - HttpServletRequest request) { - List> result = payRollPegawaiService.prosesPremiAsuransi(idJenisGaji,periode,idRekanan,DateUtil.toDate(tglHistori)); - + @RequestParam(value = "idJenisGaji") Integer idJenisGaji, @RequestParam(value = "periode") String periode, + @RequestParam(value = "idRekanan") Integer idRekanan, + @RequestParam(value = "tglHistori", required = false) String tglHistori, HttpServletRequest request) { + List> result = payRollPegawaiService.prosesPremiAsuransi(idJenisGaji, periode, idRekanan, + toDate(tglHistori)); 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - @RequestMapping(value="/save-premi-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-premi-asuransi", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> savePremiAsuransi(@RequestBody List dtos, HttpServletRequest request) { List result = payRollPegawaiService.savePremiAsuransi(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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java index 37dc6b12..2a865444 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java @@ -1,32 +1,23 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dao.MapJabatanToUraianTugasDao; import com.jasamedika.medifirst2000.dao.MapUraianTugasToRincianKegiatanDao; import com.jasamedika.medifirst2000.dto.EditPegawaiDto; import com.jasamedika.medifirst2000.dto.PegawaiDto; import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.security.model.AppPermission; import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.JsonUtil; import com.jasamedika.medifirst2000.util.PasswordUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.security.core.Authentication; @@ -34,7 +25,22 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.*; +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.constants.Master.TIDAK_ADA_PERUBAHAN_DATA; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.*; +import static com.jasamedika.medifirst2000.security.model.AppPermission.SPECIALS; +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.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; /** * Controller class for Pasien Business @@ -43,7 +49,7 @@ import java.util.*; */ @RestController @RequestMapping("/pegawai") -public class PegawaiController extends LocaleController implements IBaseRestController { +public class PegawaiController extends LocaleController { private static final Logger LOGGER = LoggerFactory.getLogger(PegawaiController.class); @@ -86,48 +92,44 @@ public class PegawaiController extends LocaleController implements IB @Autowired private LogbookKinerjaService logbookKinerjaService; - @RequestMapping(value = "/get-all-dokter2", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-dokter2", method = GET) public ResponseEntity> getAllDokter2(HttpServletRequest request) { try { - List listPegawaiVo = pegawaiService.getAllDokter(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + List result = pegawaiService.getAllDokter(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllDokter", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-dokter", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-dokter", method = GET) public ResponseEntity> getAllDokter( @RequestParam(value = "kodeRuangan", required = false) String kodeRuangan, @RequestParam(value = "tanggal", required = false) String tanggal, HttpServletRequest request) { try { - List listPegawaiVo = pegawaiService.getAllDokterByRuanganAndTanggal(kodeRuangan, - DateUtil.toDate(tanggal)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + List result = pegawaiService.getAllDokterByRuanganAndTanggal(kodeRuangan, toDate(tanggal)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllDokterByRuanganAndTanggal", 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.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllDokterByRuanganAndTanggal", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllPegawai( + @RequestMapping(value = "/get-all-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllPegawai( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "20") Integer take, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @@ -138,182 +140,167 @@ public class PegawaiController extends LocaleController implements IB return constructListPageResult(result); } - @RequestMapping(value = "/get-by-satuan-kerja", method = RequestMethod.GET) + @RequestMapping(value = "/get-by-satuan-kerja", method = GET) public ResponseEntity>> getAllBySatuanKerja( @RequestParam(value = "satuankerjaId") Integer satuanKerjaId, HttpServletRequest request) { try { - List> listPegawaiVo = pegawaiService.getAllBySatuanKerja(satuanKerjaId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getAllBySatuanKerja(satuanKerjaId); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllBySatuanKerja", 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.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllBySatuanKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai", method = GET) public ResponseEntity>> getAllPegawai( @RequestParam(value = "key", required = false) String key, @RequestParam(value = "tanggal", required = false) String tanggal, HttpServletRequest request) { try { - List> listPegawaiVo = pegawaiService.getAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getAll(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pegawaiService.getAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.getAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-perawat", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-perawat", method = GET) public ResponseEntity>> getAllPerawat( @RequestParam(value = "key", required = false) String key, @RequestParam(value = "tanggal", required = false) String tanggal, HttpServletRequest request) { try { - List> listPegawaiVo = pegawaiService + List> result = pegawaiService .getAllByJenisPegawai(GetSettingDataFixed("KdJenisPegawaiParamedis"), key); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllByJenisPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllByJenisPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-riwayat-pekerjaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-riwayat-pekerjaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveRiwayatPekerjaan(@Valid @RequestBody RiwayatPekerjaanVO vo, HttpServletRequest request) { try { RiwayatPekerjaanVO result = riwayatPekerjaanService.add(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - RestUtil.getJsonHttptatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Riwayat Pekerjaan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatPekerjaanService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Pekerjaan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatPekerjaanService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-riwayat-pelatihan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-riwayat-pelatihan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveRiwayatPelatihan(@Valid @RequestBody RiwayatPelatihanVO vo, HttpServletRequest request) { try { RiwayatPelatihanVO result = riwayatPelatihanService.add(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - RestUtil.getJsonHttptatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Riwayat Pelatihan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatPelatihanService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Pelatihan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatPelatihanService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-riwayat-pendidikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-riwayat-pendidikan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveRiwayatPendidikan(@Valid @RequestBody RiwayatPendidikanVO vo, HttpServletRequest request) { try { RiwayatPendidikanVO result = riwayatPendidikanService.add(vo); - if (null != result && result.getKeterangan().equals(Master.TIDAK_ADA_PERUBAHAN_DATA)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK, - getMessage(MessageResource.LABEL_SUCCESS_OK, request)); - return RestUtil.getJsonResponse(Master.TIDAK_ADA_PERUBAHAN_DATA, HttpStatus.NOT_MODIFIED, - mapHeaderMessage); + if (null != result && result.getKeterangan().equals(TIDAK_ADA_PERUBAHAN_DATA)) { + mapHeaderMessage.put(LABEL_SUCCESS_OK, getMessage(MessageResource.LABEL_SUCCESS_OK, request)); + return getJsonResponse(TIDAK_ADA_PERUBAHAN_DATA, NOT_MODIFIED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - RestUtil.getJsonHttptatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Riwayat Pendidikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatPendidikanService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Pendidikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatPendidikanService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-riwayat-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-riwayat-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveRiwayatJabatan(@Valid @RequestBody RiwayatJabatanVO vo, HttpServletRequest request) { try { RiwayatJabatanVO result = riwayatJabatanService.add(vo); - if (null != result && result.getKeterangan().equals(Master.TIDAK_ADA_PERUBAHAN_DATA)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK, - getMessage(MessageResource.LABEL_SUCCESS_OK, request)); - return RestUtil.getJsonResponse(Master.TIDAK_ADA_PERUBAHAN_DATA, HttpStatus.NOT_MODIFIED, - mapHeaderMessage); + if (null != result && result.getKeterangan().equals(TIDAK_ADA_PERUBAHAN_DATA)) { + mapHeaderMessage.put(LABEL_SUCCESS_OK, getMessage(MessageResource.LABEL_SUCCESS_OK, request)); + return getJsonResponse(TIDAK_ADA_PERUBAHAN_DATA, NOT_MODIFIED, mapHeaderMessage); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - RestUtil.getJsonHttptatus(HttpStatus.CREATED); - return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Riwayat Jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when riwayatJabatanService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Riwayat Jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when riwayatJabatanService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody PegawaiVO vo) { try { PegawaiVO result = pegawaiService.add(vo); if (null != result) - return RestUtil.getJsonResponse("", HttpStatus.CREATED); + return getJsonResponse("", CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pegawaiService.add", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.add", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } - @RequestMapping(value = "/update-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - @AppPermission(AppPermission.SPECIALS) + @RequestMapping(value = "/update-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + @AppPermission(SPECIALS) public ResponseEntity editVOWithPassword(@Valid @RequestBody EditPegawaiDto vo, HttpServletRequest request) { try { @@ -329,18 +316,18 @@ public class PegawaiController extends LocaleController implements IB return editVO(result); } else { LOGGER.error("Got exception when update Pegawai, password invalid"); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Password"); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + 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.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, "User is unauthorized"); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (Exception e) { - LOGGER.error("Got exception {} when update Pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got exception {} when getAuthentication", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -348,278 +335,248 @@ public class PegawaiController extends LocaleController implements IB try { PegawaiVO result = pegawaiService.update(vo); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS)); - return RestUtil.getJsonResponse("", HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS)); + return getJsonResponse("", OK, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pegawaiService.update", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pegawaiService.update", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttpStatus(NOT_ACCEPTABLE); } + @RequestMapping(value = "/{id}", method = GET) public ResponseEntity getVO(@PathVariable("id") Integer id) { PegawaiVO pegawaiVO = pegawaiService.findById(id); - return RestUtil.getJsonResponse(pegawaiVO, HttpStatus.OK); + return getJsonResponse(pegawaiVO, OK); } - @RequestMapping(value = "/get-pegawai-by-nik/{nik}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-by-nik/{nik}", method = GET) public ResponseEntity> getAllVOWithQueryString(@PathVariable("nik") String nik, HttpServletRequest request) { try { - List listPegawaiVO = pegawaiService.findByNik(nik); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVO, HttpStatus.OK, mapHeaderMessage); + List result = pegawaiService.findByNik(nik); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Asal Rujukan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findByNik", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Asal Rujukan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findByNik", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @RequestMapping(value = "/get-pegawai-by-id/{id}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-id/{id}/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKelasByRuangan(@PathVariable("id") Integer id, HttpServletRequest request) { try { Map result = pegawaiService.findPegawaiById(id); boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-customs/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getPegawaiById(@PathVariable("id") Integer id) { - // PegawaiVO pegawaiVO = pegawaiService.getPegawaiById(id); RekamDataPegawaiVO rekamDataPegawaiVO = pegawaiService.findRekamDataPegawaiById(id); - return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); + return getJsonResponse(rekamDataPegawaiVO, OK); } - @RequestMapping(value = "/get-pegawai-detail-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-detail-by-customs/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiDetailById(@PathVariable("id") Integer id) { try { Map rekamDataPegawaiVO = pegawaiService.findPegawaiDetailById(id); List> mappingJabatan = mapPegawaiJabatanToUnitKerjaService.findAllDetailByPegawai(id); rekamDataPegawaiVO.put("mappingJabatan", mappingJabatan); - return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); + return getJsonResponse(rekamDataPegawaiVO, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-peserta-didik-detail-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-peserta-didik-detail-by-customs/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPesertaDidikDetailById(@PathVariable("id") Integer id) { try { Map rekamDataPegawaiVO = pegawaiService.findPesertaDidikDetailById(id); - return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); + return getJsonResponse(rekamDataPegawaiVO, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-by-ruangan/{unitKerja}/{tahun}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-ruangan/{unitKerja}/{tahun}/{bulan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuangan(@PathVariable("unitKerja") Integer unitKerja, @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { try { Map result = pegawaiService.findPegawaiByRuangan(unitKerja, tahun, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-by-jadwal/{tahun}/{bulan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-jadwal/{tahun}/{bulan}/{pegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByJadwal(@PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { try { Map result = pegawaiService.findPegawaiByRuangan(0, tahun, bulan, pegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-uraian/{jabatan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-uraian/{jabatan}/{pegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUraianPegawai(@PathVariable("jabatan") Integer jabatan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { try { Map result = new HashMap<>(); result.put("items", JsonUtil.ToMaps(mapUraianTugasToRincianKegiatanDao .findByMapJabatanToUraianTugasId(mapUraianToJabatanDao.findByPegawaiId(pegawai).get(0).getId()))); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPegawai(HttpServletRequest request) { try { Map result = pegawaiService.dataAllPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-by-pelaksana", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-pelaksana", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByPelaksana(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = pegawaiService.getPegawaiByPelaksana(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPegawaiByPelaksana", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPegawaiByPelaksana", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPegawaiByPelaksana", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPegawaiByPelaksana", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-no-paging/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-no-paging/", method = GET) public ResponseEntity> findAllPegwawaiNoPaging(HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiNoPaging(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findAllPegawaiNoPaging(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiNoPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiNoPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-pns/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-pns/", method = GET) public ResponseEntity> findAllPegawaiPns(HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiPNS(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findAllPegawaiPNS(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pegawai pns", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiPNS", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all pegawai pns", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiPNS", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-mitra/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-mitra/", method = GET) public ResponseEntity> findAllPegawaiMitra(HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiMitra(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findAllPegawaiMitra(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all mitra", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiMitra", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all mitra", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiMitra", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-peserta-didik/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-peserta-didik/", method = GET) public ResponseEntity> findAllPegawaiPesertaDidik(HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiPesertaDidik(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findAllPegawaiPesertaDidik(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all peserta didik", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiPesertaDidik", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all peserta didik", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiPesertaDidik", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-dokter-tamu/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-dokter-tamu/", method = GET) public ResponseEntity> findAllPegawaiDokterTamu(HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiDokterTamu(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findAllPegawaiDokterTamu(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pegawai dokter tamu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiDokterTamu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all pegawai dokter tamu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiDokterTamu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/search-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/search-pegawai", method = GET) public ResponseEntity> searchPegawaiCustom( @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, @@ -627,716 +584,673 @@ public class PegawaiController extends LocaleController implements IB @RequestParam(value = "listStatusPegawaiId", required = false) List listStatusPegawaiId, @RequestParam(value = "periode", required = false) String periode, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.searchPegawaiCustom(nama, idUnitKerja, idKedudukan, + Map result = pegawaiService.searchPegawaiCustom(nama, idUnitKerja, idKedudukan, listStatusPegawaiId, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when searchPegawaiCustom", 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.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when searchPegawaiCustom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/search-pegawai-mitra", method = RequestMethod.GET) + @RequestMapping(value = "/search-pegawai-mitra", method = GET) public ResponseEntity> searchMitraCustom( @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, @RequestParam(value = "idKedudukan", required = false) Integer idKedudukan, @RequestParam(value = "periode", required = false) String periode, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.searchMitraCustom(nama, idUnitKerja, idKedudukan, - periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.searchMitraCustom(nama, idUnitKerja, idKedudukan, periode); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pegawai mitra", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when searchMitraCustom", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all pegawai mitra", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when searchMitraCustom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/search-dokter-tamu", method = RequestMethod.GET) + @RequestMapping(value = "/search-dokter-tamu", method = GET) public ResponseEntity> searchPegawaiDokterTamu( @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, @RequestParam(value = "idKedudukan", required = false) Integer idKedudukan, @RequestParam(value = "periode", required = false) String periode, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.searchDokterTamuCustom(nama, idUnitKerja, idKedudukan, - periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.searchDokterTamuCustom(nama, idUnitKerja, idKedudukan, periode); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pegawai dokter tamu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when searchDokterTamuCustom", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all pegawai dokter tamu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when searchDokterTamuCustom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/search-peserta-didik", method = RequestMethod.GET) + @RequestMapping(value = "/search-peserta-didik", method = GET) public ResponseEntity> searchPesertaDidikCustom( @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, @RequestParam(value = "idKedudukan", required = false) Integer idKedudukan, @RequestParam(value = "periode", required = false) String periode, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.searchPesertaDidikCustom(nama, idUnitKerja, idKedudukan, + Map result = pegawaiService.searchPesertaDidikCustom(nama, idUnitKerja, idKedudukan, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all pegawai mitra", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when searchPesertaDidikCustom", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all pegawai mitra", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when searchPesertaDidikCustom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-lain-lain/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-lain-lain/", method = GET) public ResponseEntity> findAllPegwawaiLainLain( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiLainLain(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findAllPegawaiLainLain(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiLainLain", 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.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiLainLain", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-no-paging-search", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-no-paging-search", method = GET) public ResponseEntity> findAllPegawaiNoPagingSearch( @RequestParam(value = "namaPegawai") String namaPegawai, @RequestParam(value = "idJabatan") String idJabatan, @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findAllPegawaiNoPagingSearch(namaPegawai, idJabatan, + Map result = pegawaiService.findAllPegawaiNoPagingSearch(namaPegawai, idJabatan, idSubUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiNoPagingSearch", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiNoPagingSearch", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-keluarga-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-keluarga-pegawai", method = GET) public ResponseEntity> getDataKeluargaPegawai(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { - Map listPegawaiVo = keluargaPegawaiService.findAllDataKeluargaPegawai(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = keluargaPegawaiService.findAllDataKeluargaPegawai(id); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllDataKeluargaPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllDataKeluargaPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/find-pegawai-by-id-custom/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-pegawai-by-id-custom/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findpegawaiByIdCustom(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = pegawaiService.findPegawaiByIdCustom(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-by-ruangan/{ruangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-ruangan/{ruangan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuangan(@PathVariable("ruangan") Integer ruangan, HttpServletRequest request) { try { Map result = pegawaiService.findPegawaiByRuangan(ruangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-all-jadwal-pegawai-rev2/", method = RequestMethod.POST) + @RequestMapping(value = "/save-all-jadwal-pegawai-rev2/", method = POST) public ResponseEntity> addAllVOPegawai(@RequestBody List vos, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaServices.saveListJadwalPegawai(vos, false, false); 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 all jadwal pegawai revisi 2", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveListJadwalPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save all jadwal pegawai revisi 2", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveListJadwalPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/unggah-simpan-jadwal-pegawai/", method = RequestMethod.POST) + @RequestMapping(value = "/unggah-simpan-jadwal-pegawai/", method = POST) public ResponseEntity> unggahSimpanJadwalPegawai( @RequestBody List vos, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaServices.saveListJadwalPegawaiExcel(vos); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when unggah dan simpan jadwal pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveListJadwalPegawaiExcel", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when unggah dan simpan jadwal pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveListJadwalPegawaiExcel", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-by-ruangan-rev2/{subUnitKerja}/{tahun}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-by-ruangan-rev2/{subUnitKerja}/{tahun}/{bulan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuanganrev2( @PathVariable("subUnitKerja") Integer subUnitKerja, @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { try { Map result = pegawaiService.findPegawaiByRuanganRev2(subUnitKerja, tahun, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-pegawai-aktif-by-ruangan/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-aktif-by-ruangan/", method = GET) public ResponseEntity> getAllPegawaiAktifByRuangan( @RequestParam(value = "idRuangan", required = false) Integer idRuangan, HttpServletRequest request) { try { - List listPegawaiVo = pegawaiService.findAllPegawaiAktifByRuangan(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + List result = pegawaiService.findAllPegawaiAktifByRuangan(idRuangan); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllPegawaiAktifByRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllPegawaiAktifByRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-pegawai-by-id-mobile/{idPegawai}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-by-id-mobile/{idPegawai}", method = GET) public ResponseEntity> getPegawaiByIdForMobile(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { - Map pegawai = pegawaiService.getPegawaiByIdMobile(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawai, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.getPegawaiByIdMobile(idPegawai); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPegawaiByIdMobile", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPegawaiByIdMobile", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-with-username-by-id/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-with-username-by-id/{id}", method = GET) public ResponseEntity> getPegawaiWithNamaUserById(@PathVariable("id") Integer id, HttpServletRequest request) { try { - Map pegawai = pegawaiService.getPegawaiWithNamaUserById(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawai, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.getPegawaiWithNamaUserById(id); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getPegawaiWithNamaUserById", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPegawaiWithNamaUserById", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getPegawaiWithNamaUserById", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPegawaiWithNamaUserById", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-registrasi-pegawai-mobile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-registrasi-pegawai-mobile", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity SaveRegistrasiPegawaiMobile(@RequestBody RegistrasiPegawaiMobileVO vo, HttpServletRequest request) { try { String result = pegawaiService.SaveRegistrasiPegawaiMobile(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when SaveRegistrasiPegawaiMobile", 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.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when SaveRegistrasiPegawaiMobile", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-tgl-pensiun/{tglLahir}/{idjabatan}", method = RequestMethod.GET) + @RequestMapping(value = "/get-tgl-pensiun/{tglLahir}/{idjabatan}", method = GET) public ResponseEntity> getPegawaiByIdForMobile(@PathVariable("idjabatan") Integer idjabatan, @PathVariable("tglLahir") String tglLahir, HttpServletRequest request) { try { Map tglpensiun = pegawaiService.getTglpensiun(tglLahir, idjabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(tglpensiun, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(tglpensiun, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getTglpensiun", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getTglpensiun", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/non-aktif-pegawai-by-id/{id}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/non-aktif-pegawai-by-id/{id}/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> deletePegawai(@PathVariable("id") Integer id, HttpServletRequest request) { try { Map result = pegawaiService.nonAktifPegawai(id); if (CommonUtil.isNotNullOrEmpty(result)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-pensiun/{startPeriode}/{endPeriode}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-pensiun/{startPeriode}/{endPeriode}", method = GET) public ResponseEntity>> getPegawaiPensiun( @PathVariable("startPeriode") String startPeriode, @PathVariable("endPeriode") String endPeriode, HttpServletRequest request) { try { - List> tglpensiun = pegawaiService.getPegawaiYgAkanPensiun(startPeriode, endPeriode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(tglpensiun, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getPegawaiYgAkanPensiun(startPeriode, endPeriode); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPegawaiYgAkanPensiun", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getPegawaiYgAkanPensiun", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-by-sub-Unit-kerja/{idSubUnitKerja}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-by-sub-Unit-kerja/{idSubUnitKerja}", method = GET) public ResponseEntity>> getPegawaiPensiun( @PathVariable("idSubUnitKerja") Integer idSubUnitKerja, HttpServletRequest request) { try { - List> tglpensiun = pegawaiService.getpegawaiByUnitkerja(idSubUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(tglpensiun, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiByUnitkerja(idSubUnitKerja); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByUnitkerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByUnitkerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-kewenangan-klinis-expired", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-kewenangan-klinis-expired", method = GET) public ResponseEntity>> getPegawaiKewenanganKlinisExpired(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiPenugasanKlinisExpired(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiPenugasanKlinisExpired(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getpegawaiPenugasanKlinisExpired", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiPenugasanKlinisExpired", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getpegawaiPenugasanKlinisExpired", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiPenugasanKlinisExpired", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-str-expired", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-str-expired", method = GET) public ResponseEntity>> getPegawaiStrExpired(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiStrExpired(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiStrExpired(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiStrExpired", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiStrExpired", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-sip-expired", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-sip-expired", method = GET) public ResponseEntity>> getPegawaiSipExpired(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiSipExpired(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiSipExpired(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiSipExpired", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiSipExpired", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-count-pegawai-by-unit-kerja", method = RequestMethod.GET) + @RequestMapping(value = "/get-count-pegawai-by-unit-kerja", method = GET) public ResponseEntity>> getCountPegawaiByUnitKerja(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiByUnitKerja(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiByUnitKerja(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByUnitKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByUnitKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-count-pegawai-by-kelompok-jabatan", method = RequestMethod.GET) + @RequestMapping(value = "/get-count-pegawai-by-kelompok-jabatan", method = GET) public ResponseEntity>> getCountPegawaiByKelompokJabatan(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiByKelompokJabatan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiByKelompokJabatan(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByKelompokJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByKelompokJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-count-pegawai-by-status-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-count-pegawai-by-status-pegawai", method = GET) public ResponseEntity>> getCountPegawaiByStatusPegawai(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiByStatusPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiByStatusPegawai(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByStatusPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByStatusPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-count-pegawai-by-jk", method = RequestMethod.GET) + @RequestMapping(value = "/get-count-pegawai-by-jk", method = GET) public ResponseEntity>> getCountPegawaiByJK(HttpServletRequest request) { try { - List> pegawais = pegawaiService.getpegawaiByJenisKelamin(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getpegawaiByJenisKelamin(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getpegawaiByJenisKelamin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getpegawaiByJenisKelamin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-meninggal-pindah-pensiun-no-paging/", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-meninggal-pindah-pensiun-no-paging/", method = GET) public ResponseEntity> findPegawaiMeninggalPindahPensiunNoPaging( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findPegawaiMeninggalPindahPensiunNoPaging(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findPegawaiMeninggalPindahPensiunNoPaging(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPegawaiMeninggalPindahPensiunNoPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiMeninggalPindahPensiunNoPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-meninggal-pindah-pensiun-nonsdm/", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-meninggal-pindah-pensiun-nonsdm/", method = GET) public ResponseEntity> findPegawaiMeninggalPindahPensiunNonSdm( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findPegawaiMeninggalPindahPensiunNonSdm(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findPegawaiMeninggalPindahPensiunNonSdm(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPegawaiMeninggalPindahPensiunNonSdm", 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.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiMeninggalPindahPensiunNonSdm", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-outsourcing/", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-outsourcing/", method = GET) public ResponseEntity> findPegawaiOutSourcingNoPaging( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - Map listPegawaiVo = pegawaiService.findPegawaiOutSourcingNoPaging(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + Map result = pegawaiService.findPegawaiOutSourcingNoPaging(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPegawaiOutSourcingNoPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiOutSourcingNoPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-custom/", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-custom/", method = GET) public ResponseEntity>> findAllPegawaiCustom( @RequestParam(value = "key", required = false) String key, HttpServletRequest request) { try { - List> listPegawaiVo = pegawaiService.getAllPegawaiCustom(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getAllPegawaiCustom(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllPegawaiCustom", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllPegawaiCustom", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-kepala-ruangan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-kepala-ruangan", method = GET) public ResponseEntity>> findAllPegawaiKepalaRuangan(HttpServletRequest request) { try { - List> listPegawai = pegawaiService.getAllKepalaRuangan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawai, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.getAllKepalaRuangan(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllKepalaRuangan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllKepalaRuangan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-jabatan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-jabatan", method = GET) public ResponseEntity>> findAllJabatan(HttpServletRequest request) { try { - List> listPegawai = pegawaiService.findAllJabatan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawai, HttpStatus.OK, mapHeaderMessage); + List> result = pegawaiService.findAllJabatan(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-sdm-for-cred", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-sdm-for-cred", method = GET) public ResponseEntity> findPegawaiSDMforCred(HttpServletRequest request) { Map result = new HashMap<>(); try { - List listPegawai = pegawaiService.findPegawaiSDMforCred(); - result.put("data", listPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + List data = pegawaiService.findPegawaiSDMforCred(); + result.put("data", data); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get pegawai sdm for credential", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPegawaiSDMforCred", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get pegawai sdm for credential", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiSDMforCred", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-jabatan-by-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-jabatan-by-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllJabatanByPegawai( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = pegawaiService.findJabatanByPegawai(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/jabatan-kontrak-verif-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jabatan-kontrak-verif-kinerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanKontrakVerifKinerja(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "pegawaiLoginId") Integer idPegawaiLogin) { try { List> result = logbookKinerjaService.findJabatanKontrakVerifKinerja(idPegawai, idPegawaiLogin); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/jabatan-logbook-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jabatan-logbook-kinerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanLogbookKinerja(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "bulan") Long bulan) { try { List> result = logbookKinerjaService.findJabatanByLogbookPegawai(idPegawai, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-jurusan-by-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-jurusan-by-pendidikan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListJurusanByPendidikan( @RequestParam(value = "pendidikanId") Integer pendidikanId, HttpServletRequest request) { try { Map result = pegawaiService.findListJurusanByPendidikan(pendidikanId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get jurusan by pendidikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findListJurusanByPendidikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get jurusan by pendidikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findListJurusanByPendidikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pangkat-golongan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-pangkat-golongan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllPangkatGolongan(HttpServletRequest request) { try { List> result = pegawaiService.findAllPangkatGolongan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-pegawai-pendapatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pegawai-pendapatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPegawaiPendapatan(HttpServletRequest request, @RequestParam(value = "idDepartemen", required = false) Integer idDepartemen, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @@ -1351,110 +1265,106 @@ public class PegawaiController extends LocaleController implements IB } else if (CommonUtil.isNotNullOrEmpty(idUnitKerja)) { result = pegawaiService.findListPegawaiPendapatanUnitKerja(idUnitKerja, month); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get pegawai sdm for credential", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findListPegawaiPendapatan departemen/ruangan/unitkerja", + e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get pegawai sdm for credential", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findListPegawaiPendapatan departemen/ruangan/unitkerja", + jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/reset-login-pegawai-keluar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/reset-login-pegawai-keluar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> resetLoginPegawaiKeluar(HttpServletRequest request) { try { LoginUser loginUser = loginUserService.getLoginUser(); Map result = pegawaiService.resetLoginPegawaiKeluar(loginUser.getPegawai().getId()); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when reset login pegawai keluar", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when resetLoginPegawaiKeluar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when reset login pegawai keluar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when resetLoginPegawaiKeluar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/check-existing-fingerid", method = RequestMethod.GET) + @RequestMapping(value = "/check-existing-fingerid", method = GET) public ResponseEntity>> findExistingFingerId(HttpServletRequest request, @RequestParam(value = "fingerId") String idFinger, @RequestParam(value = "pegawaiId", required = false) Integer idPegawai) { try { List> result = pegawaiService.findExistingFingerId(idFinger, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when check existing finger id", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findExistingFingerId", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when check existing finger id", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findExistingFingerId", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-birthday", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-birthday", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getBirthdayEmployee(HttpServletRequest request) { try { List> result = pegawaiService.findBirthdayEmployees(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get birthday", e.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, e.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findBirthdayEmployees", e.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, e.getMessage()); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get birthday", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findBirthdayEmployees", jse.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonResponse(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-avatar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-avatar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getAvatar(HttpServletRequest request, @RequestParam(value = "pegawaiId", required = false) Integer idPegawai) { try { String result = pegawaiService.findAvatar(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get avatar", e.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, e.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAvatar", e.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, e.getMessage()); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get avatar", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonResponse(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAvatar", jse.getMessage()); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonResponse(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/kelengkapan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/kelengkapan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity completePegawai(@Valid @RequestBody PegawaiDto dto) { try { pegawaiService.completeDataPegawai(dto); - return RestUtil.getJsonResponse(true, HttpStatus.CREATED); + return getJsonResponse(true, CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when complete data pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when completeDataPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when complete data Pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when completeDataPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java index fbf152db..ae487da3 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java @@ -1,31 +1,33 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.BatalPaketProdukDto; import com.jasamedika.medifirst2000.dto.TagihanPendaftaranDto; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.*; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.MapProdukPaketToProdukVO; import com.jasamedika.medifirst2000.vo.MapProdukPaketVO; import com.jasamedika.medifirst2000.vo.PelayananPasienVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; + @RestController @RequestMapping("/pelayanan") public class PelayananController extends LocaleController { @@ -50,275 +52,257 @@ public class PelayananController extends LocaleController { @Autowired private MapProdukPaketToProdukService mapProdukPaketToProdukService; - @RequestMapping(value = "/calculate-indikator-pelayanan", method = RequestMethod.GET) + @RequestMapping(value = "/calculate-indikator-pelayanan", method = GET) public ResponseEntity>> calculateIndikatorPelayanan(HttpServletRequest request, @RequestParam("tahun") String tahun) { try { List> result = pasienDaftarService.findIndikatorPelayanan(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when calculate indikator pelayanan", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findIndikatorPelayanan", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when calculate indikator pelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findIndikatorPelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/validate-nama-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/validate-nama-produk", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> validateNamaProduk(HttpServletRequest request, @RequestParam(value = "idProduk", required = false) Integer idProduk, @RequestParam(value = "namaProduk") String namaProduk) { try { Map result = produkService.validateNamaProduk(idProduk, namaProduk); - - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when validate nama produk", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when validateNamaProduk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when validate nama produk", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when validateNamaProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/paket-to-produk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/paket-to-produk", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getMappingPaketToProduk(HttpServletRequest request, @RequestParam(value = "idMapping") Integer idMapping) { try { Map result = produkService.getMappingPaketToProduk(idMapping); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get mapping paket to produk", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getMappingPaketToProduk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get mapping paket to produk", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getMappingPaketToProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/all-paket-produk", method = RequestMethod.GET) + @RequestMapping(value = "/all-paket-produk", method = GET) public ResponseEntity>> getAllPaketToProduk(HttpServletRequest request) { try { List> result = produkService.getAllPaketToProduk(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when get all data paket to produk", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getAllPaketToProduk", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all data paket to produk", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getAllPaketToProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/master-satuan-standar", method = RequestMethod.GET) + @RequestMapping(value = "/master-satuan-standar", method = GET) public ResponseEntity>> getAllMasterSatuanStandar(HttpServletRequest request) { try { List> result = satuanStandarService.getAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when get all master satuan standar distinct on", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when satuanStandarService.getAll", sve.getMessage()); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get all master satuan standar distinct on", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when satuanStandarService.getAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/klaim-diskon", method = RequestMethod.GET) + @RequestMapping(value = "/klaim-diskon", method = GET) public ResponseEntity> KlaimDiskon(HttpServletRequest request, @RequestParam(value = "noRegistrasi") String noRegistrasi, @RequestParam(value = "totalKlaim") Double totalKlaim, @RequestParam(value = "jenisDiskon") Integer jenisDiskon) { try { List result = pelayananPasienService.updateKlaimDiskon(noRegistrasi, totalKlaim, jenisDiskon); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when klaim diskon karyawan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateKlaimDiskon", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when klaim diskon karyawan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updateKlaimDiskon", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/reset-klaim-diskon", method = RequestMethod.GET) + @RequestMapping(value = "/reset-klaim-diskon", method = GET) public ResponseEntity ResetKlaimDiskon(HttpServletRequest request, @RequestParam(value = "noRegistrasi") String noRegistrasi) { try { String result = pelayananPasienService.resetKlaimDiskon(noRegistrasi); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when klaim diskon karyawan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when resetKlaimDiskon", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when klaim diskon karyawan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when resetKlaimDiskon", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/check-existing-harga-produk-kelas", method = RequestMethod.GET) + @RequestMapping(value = "/check-existing-harga-produk-kelas", method = GET) public ResponseEntity>> checkExistingHargaProdukKelas(HttpServletRequest request, @RequestParam(value = "kelasId") Integer idKelas, @RequestParam(value = "produkId") Integer idProduk, @RequestParam(value = "mappingId", required = false) Integer idMapping) { try { List> result = produkService.findExistingMapHargaKelas(idKelas, idProduk, idMapping); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when check existing harga produk kelas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findExistingMapHargaKelas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when check existing harga produk kelas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findExistingMapHargaKelas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/tagihan/daftar/{noRegistrasi}", method = RequestMethod.GET) + @RequestMapping(value = "/tagihan/daftar/{noRegistrasi}", method = GET) public ResponseEntity> daftarTagihan(HttpServletRequest request, @PathVariable String noRegistrasi) { try { List result = pelayananPasienService.tagihan(noRegistrasi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get daftar tagihan {}", e.getMessage(), noRegistrasi); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when pelayananPasienService.tagihan {}", e.getMessage(), + noRegistrasi); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get daftar tagihan {}", jse.getMessage(), noRegistrasi); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when pelayananPasienService.tagihan {}", jse.getMessage(), + noRegistrasi); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/tagihan/diskon/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/tagihan/diskon/save", method = RequestMethod.POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity simpanDiskonTagihan(HttpServletRequest request, @RequestParam(value = "kode-voucher", required = false) String kodeVoucher, @RequestBody List dtoList) { try { pelayananPasienService.diskonTagihan(kodeVoucher, dtoList); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(dtoList, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(dtoList, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when simpan diskon tagihan", e.getMessage()); - Map error = new HashMap<>(); - error.put("bad_request", e.getMessage()); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, error); + LOGGER.error("Got ServiceVOException {} when diskonTagihan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(BAD_REQUEST, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when simpan diskon tagihan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when diskonTagihan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/tagihan/diskon/batal-paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/tagihan/diskon/batal-paket", method = RequestMethod.POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity batalPaket(HttpServletRequest request, @RequestBody BatalPaketProdukDto dto) { try { pelayananPasienService.batalPaketProduk(request, dto); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(dto, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when batal diskon paket", e.getMessage()); - Map error = new HashMap<>(); - error.put("bad_request", e.getMessage()); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, error); + LOGGER.error("Got ServiceVOException {} when batalPaketProduk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(BAD_REQUEST, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when batal diskon paket", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when batalPaketProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/vouchers/validity", method = RequestMethod.GET) + @RequestMapping(value = "/vouchers/validity", method = GET) public ResponseEntity isValidVoucher(HttpServletRequest request, @RequestParam("kode-voucher") String kodeVoucher, @RequestParam("no-registrasi") String noRegistrasi) { try { boolean validVoucher = pelayananPasienService.isValidVoucher(kodeVoucher, noRegistrasi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(validVoucher, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(validVoucher, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when check voucher validity", e.getMessage()); - Map error = new HashMap<>(); - error.put("bad_request", e.getMessage()); - return RestUtil.getJsonResponse(false, HttpStatus.BAD_REQUEST, error); + LOGGER.error("Got ServiceVOException {} when isValidVoucher", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(BAD_REQUEST, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when check voucher validity", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when isValidVoucher", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/produk-paket/paket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/produk-paket/paket", method = RequestMethod.POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity simpanMappingListProdukPaket(HttpServletRequest request, @RequestBody List vos) { try { mapProdukPaketService.saveAll(vos); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(vos, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(vos, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when simpan mapping list produk paket", e.getMessage()); - Map error = new HashMap<>(); - error.put("bad_request", e.getMessage()); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, error); + LOGGER.error("Got ServiceVOException {} when mapProdukPaketService.saveAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(BAD_REQUEST, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when simpan mapping list produk paket", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when mapProdukPaketService.saveAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/produk-paket/produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/produk-paket/produk", method = RequestMethod.POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity simpanMappingEntriProdukPaket(HttpServletRequest request, @RequestBody List vos) { try { mapProdukPaketToProdukService.saveAll(vos); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(vos, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(vos, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when simpan mapping entri produk paket", e.getMessage()); - Map error = new HashMap<>(); - error.put("bad_request", e.getMessage()); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, error); + LOGGER.error("Got ServiceVOException {} when mapProdukPaketToProdukService.saveAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(BAD_REQUEST, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when simpan mapping entri produk paket", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when mapProdukPaketToProdukService.saveAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/RemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/RemunerasiController.java index 39fb47f2..7424bffc 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/RemunerasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/RemunerasiController.java @@ -10,7 +10,6 @@ import com.jasamedika.medifirst2000.vo.LogbookKinerjaVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.PathVariable; @@ -22,8 +21,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; -import static org.springframework.http.HttpStatus.CREATED; -import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +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; @@ -48,10 +46,10 @@ public class RemunerasiController extends LocaleController { @RequestMapping(value = "/logbook-tarif/{idPegawai}/{bulan}", method = GET) public ResponseEntity recap(HttpServletRequest request, @PathVariable("idPegawai") Integer idPegawai, @PathVariable("bulan") String bulan) { - LOGGER.info("Superapp requesting logbook tarif data id pegawai {} bulan {}", idPegawai, bulan); + LOGGER.info("Superapp requesting rekapLogbook id pegawai {} bulan {}", idPegawai, bulan); List> result = pelayananPasienService.rekapLogbook(idPegawai, bulan); - return new ResponseEntity<>(result, HttpStatus.OK); + return new ResponseEntity<>(result, OK); } @RequestMapping(value = "/authorization", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) @@ -60,7 +58,7 @@ public class RemunerasiController extends LocaleController { AuthorizationDto result = mapPegawaiJabatanToUnitKerjaService.get(dto); return new ResponseEntity<>(result, CREATED); } catch (ServiceVOException | JpaSystemException e) { - LOGGER.error("Got exception {} when get authorization for superapp", e.getMessage()); + LOGGER.error("Got exception {} when mapPegawaiJabatanToUnitKerjaService.get", e.getMessage()); return new ResponseEntity<>(null, INTERNAL_SERVER_ERROR); } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index d789bbb3..94d82934 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -1,6 +1,5 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; @@ -17,14 +16,12 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; @@ -35,6 +32,18 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.constants.Master.TIDAK_ADA_PERUBAHAN_DATA; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK; +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.ALL_VALUE; +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("/sdm") public class SdmController extends LocaleController { @@ -300,7 +309,7 @@ public class SdmController extends LocaleController { private PendapatanService pendapatanService; @Autowired - private RuanganService ruanganService; + private RuanganService ruanganService; @Autowired private RekamUraianRincianKegiatanService rekamUraianRincianKegiatanService; @@ -332,139 +341,126 @@ public class SdmController extends LocaleController { @Autowired private JatahCutiDanIzinService jatahCutiDanIzinService; - @RequestMapping(value = "/save-custom-uraian-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-custom-uraian-kerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo, HttpServletRequest request) { try { Map result = customIndexKerjaService.saveCustomIndexKerja(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveCustomIndexKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveCustomIndexKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-custom-uraian-kerja/{id}/{tanggal}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-custom-uraian-kerja/{id}/{tanggal}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getCustomUraianKerja(@PathVariable("id") String id, @PathVariable("tanggal") String tanggal, HttpServletRequest request) { try { Map result = customIndexKerjaService.findByPegawaiAndData(id, DateUtil.toDate(tanggal)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-berkas-lamaran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-berkas-lamaran", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody BerkasLamaranVO vo, HttpServletRequest request) { try { Map result = berkasLamaranService.saveBerkasLamaran(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveBerkasLamaran", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveBerkasLamaran", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-berkas-lamaran/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-berkas-lamaran/{nama}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getsaveBerkasLamaran(@PathVariable("nama") String nama, HttpServletRequest request) { try { Map result = berkasLamaranService.findByNamaPelamarNoRec(nama); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-reservasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-reservasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveReservasi(@Valid @RequestBody ReservasiVO vo, HttpServletRequest request) { try { Map result = reservasiService.saveReservasi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveReservasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveReservasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pengembalian", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pengembalian", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePengembalian(@Valid @RequestBody ReservasiVO vo, HttpServletRequest request) { try { Map result = reservasiService.saveReservasi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when reservasiService.saveReservasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when reservasiService.saveReservasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/upload-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.ALL_VALUE) + @RequestMapping(value = "/upload-absen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = ALL_VALUE) public ResponseEntity> uploadAbsen(@Valid @RequestBody UploadExcelVO fileInput, HttpServletRequest request) { try { Map result = jadwalDokterService.uploadAbsensi(fileInput); 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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when uploadAbsensi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when uploadAbsensi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-absen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAbsen(@Valid @RequestBody SaveAbsenVO fileInput, HttpServletRequest request) { try { @@ -472,1317 +468,1193 @@ public class SdmController extends LocaleController { for (AbsensiPegawaiVO absensiPegawaiVO : fileInput.getData()) { result = absensiPegawaiService.saveAbsensiPegawai(absensiPegawaiVO); } - - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveAbsensiPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveAbsensiPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jadwal/{idFinger}/{tanggalMasuk}/{tanggalKeluar}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jadwal/{idFinger}/{tanggalMasuk}/{tanggalKeluar}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> savejadwalAbsenPegawai(@PathVariable("idFinger") String idFinger, @PathVariable("tanggalMasuk") String tanggalMasuk, @PathVariable("tanggalKeluar") String tanggalKeluar, HttpServletRequest request) { try { Map result = jadwalDokterService.saveJadwalPegawai(idFinger, DateUtil.toDate(tanggalMasuk), DateUtil.toDate(tanggalKeluar)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-reservasi-by-anggota/{norec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-reservasi-by-anggota/{norec}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getReservasiByNoRec(@PathVariable("norec") String norec, HttpServletRequest request) { try { Map result = reservasiService.findReservasiByAnggota(norec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-degree", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-degree", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveDegree(@Valid @RequestBody DegreeVO vo, HttpServletRequest request) { try { Map result = degreeService.saveDegree(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 ServiceVOException {} when saveAkun", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDegree", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when saveAkun", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDegree", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-nama-pembimbing", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-nama-pembimbing", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveNamaPembimbing(@Valid @RequestBody NamaPembimbingVO vo, HttpServletRequest request) { try { Map result = namaPembimbingService.saveNamaPembimbing(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveNamaPembimbing", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveNamaPembimbing", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-nama-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-nama-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveNamaAsuransi(@Valid @RequestBody NamaAsuransiVO vo, HttpServletRequest request) { try { Map result = namaAsuransiService.saveNamaAsuransi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveNamaAsuransi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveNamaAsuransi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-kedudukan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kedudukan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKedudukan(@Valid @RequestBody KedudukanVO vo, HttpServletRequest request) { try { Map result = kedudukanService.saveKedudukan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKedudukan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKedudukan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jurusan-peminatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jurusan-peminatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJurusanPeminatan(@Valid @RequestBody JurusanPeminatanVO vo, HttpServletRequest request) { try { Map result = jurusanPeminatanService.saveJurusanPeminatan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJurusanPeminatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJurusanPeminatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jenis-sk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jenis-sk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJenisSk(@Valid @RequestBody JenisSkVO vo, HttpServletRequest request) { try { Map result = jenisSkService.saveJenisSk(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJenisSk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJenisSk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jenis-pns", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jenis-pns", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJenisPns(@Valid @RequestBody JenisPnsVO vo, HttpServletRequest request) { try { Map result = jenisPnsService.saveJenisPns(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJenisPns", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJenisPns", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jenis-cuti", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jenis-cuti", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJenisCuti(@Valid @RequestBody JenisCutiVO vo, HttpServletRequest request) { try { Map result = jenisCutiService.saveJenisCuti(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJenisCuti", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJenisCuti", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJabatan(@Valid @RequestBody JabatanVO vo, HttpServletRequest request) { try { Map result = jabatanService.saveJabatan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-institusi-pendidikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-institusi-pendidikan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveInstitusiPendidikan(@Valid @RequestBody InstitusiPendidikanVO vo, HttpServletRequest request) { try { Map result = institusiPendidikanService.saveInstitusiPendidikan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveInstitusiPendidikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveInstitusiPendidikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-fakultas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-fakultas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveFakultas(@Valid @RequestBody FakultasVO vo, HttpServletRequest request) { try { Map result = fakultasService.saveFakultas(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveFakultas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveFakultas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-tipe-koleksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-tipe-koleksi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveTipeKoleksi(@Valid @RequestBody TipeKoleksiVO vo, HttpServletRequest request) { try { Map result = tipeKoleksiService.saveTipeKoleksi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveTipeKoleksi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveTipeKoleksi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-tipe-keanggotaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-tipe-keanggotaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveTipeKeanggotaan(@Valid @RequestBody TipeKeanggotaanVO vo, HttpServletRequest request) { try { Map result = tipeKeanggotaanService.saveTipeKeanggotaan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveTipeKeanggotaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveTipeKeanggotaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-tanggungan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-tanggungan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveTanggungan(@Valid @RequestBody TanggunganVO vo, HttpServletRequest request) { try { Map result = tanggunganService.saveTanggungan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveTanggungan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveTanggungan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-status-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-status-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveStatusPegawai(@Valid @RequestBody StatusPegawaiVO vo, HttpServletRequest request) { try { Map result = statusPegawaiService.saveStatusPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveStatusPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveStatusPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-status-meninggal-dunia", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-status-meninggal-dunia", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveStatusMeninggalDunia(@Valid @RequestBody StatusMeninggalDuniaVO vo, HttpServletRequest request) { try { Map result = statusMeninggalDunia.saveStatusMeninggalDunia(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveStatusMeninggalDunia", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveStatusMeninggalDunia", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-status-kawin", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-status-kawin", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveStatusKawin(@Valid @RequestBody StatusKawinVO vo, HttpServletRequest request) { try { Map result = statusKawinService.saveStatusKawin(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveStatusKawin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveStatusKawin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-program-pengajaran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-program-pengajaran", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveProgramPengajaran(@Valid @RequestBody ProgramPengajaranVO vo, HttpServletRequest request) { try { Map result = programPengajaranService.saveProgramPengajaran(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveProgramPengajaran", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveProgramPengajaran", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-program-pendidikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-program-pendidikan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveProgramPendidikan(@Valid @RequestBody ProgramPendidikanVO vo, HttpServletRequest request) { try { Map result = programPendidikanService.saveProgramPendidikan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveProgramPendidikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveProgramPendidikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-posisi-lamaran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-posisi-lamaran", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePosisiLamaran(@Valid @RequestBody PosisiLamaranVO vo, HttpServletRequest request) { try { Map result = posisiLamaranService.savePosisiLamaran(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePosisiLamaran", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePosisiLamaran", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-periode-pinjaman", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-periode-pinjaman", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePeriodePinjaman(@Valid @RequestBody PeriodePinjamanVO vo, HttpServletRequest request) { try { Map result = periodePinjamanService.savePeriodePinjaman(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePeriodePinjaman", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePeriodePinjaman", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pekerjaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pekerjaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePekerjaan(@Valid @RequestBody PekerjaanVO vo, HttpServletRequest request) { try { Map result = pekerjaanService.savePekerjaan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePekerjaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePekerjaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-shift-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-shift-kerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveShiftKerja(@Valid @RequestBody ShiftKerjaVO vo, HttpServletRequest request) { try { Map result = shiftKerjaService.saveShiftKerja(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveShiftKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveShiftKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/delete-shift-kerja/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-shift-kerja/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> deleteShiftKerja(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = shiftKerjaService.deleteShiftKerja(id); 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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deleteShiftKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deleteShiftKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-shift-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-shift-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getShiftKerja(HttpServletRequest request) { try { Map result = shiftKerjaService.findAll(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when shiftKerjaService.findAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when shiftKerjaService.findAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-aturan-peminjaman", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-aturan-peminjaman", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAturanPeminjaman(@Valid @RequestBody AturanPeminjamanVO vo, HttpServletRequest request) { try { Map result = aturanPeminjamanService.saveAturanPeminjaman(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveAturanPeminjaman", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveAturanPeminjaman", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-bibliography", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-bibliography", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveBibliography(@Valid @RequestBody BibliographyVO vo, HttpServletRequest request) { try { Map result = bibliographyService.saveBibliography(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveBibliography", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveBibliography", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-bibliography/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-bibliography/{nama}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getBibliography(@PathVariable("nama") String nama, HttpServletRequest request) { try { Map result = bibliographyService.findByName(nama); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-daftar-keanggotaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-daftar-keanggotaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveDaftarKeanggotaan(@Valid @RequestBody DaftarKeanggotaanVO vo, HttpServletRequest request) { try { Map result = daftarKeanggotaanService.saveDaftarKeanggotaan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDaftarKeanggotaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDaftarKeanggotaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-data-keluarga", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-data-keluarga", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveDataKeluarga(@Valid @RequestBody DataKeluargaVO vo, HttpServletRequest request) { try { Map result = dataKeluargaService.saveDataKeluarga(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDataKeluarga", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDataKeluarga", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-data-keluarga", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-keluarga", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataKeluarga(HttpServletRequest request) { try { List> result = dataKeluargaService.findAll(); 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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when dataKeluargaService.findAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when dataKeluargaService.findAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-data-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-data-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveDataPegawai(@Valid @RequestBody DataPegawaiVO vo, HttpServletRequest request) { try { Map result = dataPegawaiService.saveDataPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveDataPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveDataPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-mutasi-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-mutasi-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMutasiPegawai(@Valid @RequestBody MutasiPegawaiVO vo, HttpServletRequest request) { try { Map result = mutasiPegawaiService.saveMutasiPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMutasiPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMutasiPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-load-mutasi-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-mutasi-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getLoadDataMutasi(HttpServletRequest request) { try { Map result = mutasiPegawaiService.noAgenda(); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when mutasiPegawaiService.noAgenda", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when mutasiPegawaiService.noAgenda", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-perhitungan-premi-b-p-j-s-kesehatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-premi-b-p-j-s-kesehatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganPremiBPJSKesehatan( @Valid @RequestBody PerhitunganPremiBPJSKesehatanVO vo, HttpServletRequest request) { try { Map result = perhitunganPremiBPJSKesehatanService.savePerhitunganPremiBPJSKesehatan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerhitunganPremiBPJSKesehatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerhitunganPremiBPJSKesehatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-perhitungan-premi-b-p-j-s-ketenagakerjaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-premi-b-p-j-s-ketenagakerjaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganPremiBPJSKetenagakerjaan( @Valid @RequestBody PerhitunganPremiBPJSKetenagaKerjaanVO vo, HttpServletRequest request) { try { Map result = perhitunganPremiBPJSKetenagakerjaanService .savePerhitunganPremiBPJSKetenagaKerjaan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerhitunganPremiBPJSKetenagaKerjaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerhitunganPremiBPJSKetenagaKerjaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-perhitungan-santunan-pegawai-meninggal-dunia", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-santunan-pegawai-meninggal-dunia", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganSantunanPegawaiMeninggalDunia( @Valid @RequestBody PerhitunganSantunanPegawaiMeninggalDuniaVO vo, HttpServletRequest request) { try { Map result = perhitunganSantunanPegawaiMeninggalDuniaService .savePerhitunganSantunanPegawaiMeninggalDunia(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerhitunganSantunanPegawaiMeninggalDunia", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerhitunganSantunanPegawaiMeninggalDunia", + jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-perhitungan-uang-lembur-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-uang-lembur-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganUangLemburPegawai( @Valid @RequestBody PerhitunganUangLemburPegawaiVO vo, HttpServletRequest request) { try { Map result = perhitunganUangLemburPegawaiService.savePerhitunganUangLemburPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerhitunganUangLemburPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerhitunganUangLemburPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-periode-pengajar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-periode-pengajar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePeriodePengajar(@Valid @RequestBody PeriodePengajarVO vo, HttpServletRequest request) { try { Map result = periodePengajarService.savePeriodePengajar(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePeriodePengajar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePeriodePengajar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-permohonan-cuti-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-permohonan-cuti-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePermohonanCutiPegawai(@Valid @RequestBody PermohonanCutiPegawaiVO vo, HttpServletRequest request) { try { Map result = permohonanCutiPegawaiService.savePermohonanCutiPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePermohonanCutiPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePermohonanCutiPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-registrasi-keanggotaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-registrasi-keanggotaan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRegistrasiKeanggotaan(@Valid @RequestBody RegistrasiKeanggotaanVO vo, HttpServletRequest request) { try { Map result = registrasiKeanggotaanService.saveRegistrasiKeanggotaan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRegistrasiKeanggotaan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRegistrasiKeanggotaan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-registrasi-keanggotaan/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-registrasi-keanggotaan/{nama}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRegistrasiKeanggotaan(@PathVariable("nama") String nama, HttpServletRequest request) { try { Map result = registrasiKeanggotaanService.findByName(nama); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/hapus-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/hapus-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> hapusPegawai(@Valid @RequestBody RekamDataPegawaiVO vo, HttpServletRequest request) { try { Map result = rekamDataPegawaiService.saveRekamDataPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRekamDataPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRekamDataPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-rekam-data-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-rekam-data-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRekamDataPegawai(@Valid @RequestBody RekamDataPegawaiVO vo, HttpServletRequest request) { try { Map result = rekamDataPegawaiService.saveRekamDataPegawaiRev(vo); - if (null != result && result.get("noRec").equals(Master.TIDAK_ADA_PERUBAHAN_DATA)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK, - getMessage(MessageResource.LABEL_SUCCESS_OK, request)); - return RestUtil.getJsonResponse(result, HttpStatus.NOT_MODIFIED, mapHeaderMessage); + if (null != result && result.get("noRec").equals(TIDAK_ADA_PERUBAHAN_DATA)) { + mapHeaderMessage.put(LABEL_SUCCESS_OK, getMessage(MessageResource.LABEL_SUCCESS_OK, request)); + return getJsonResponse(result, NOT_MODIFIED, mapHeaderMessage); } else { - 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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRekamDataPegawaiRev", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRekamDataPegawaiRev", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-uraian-tugas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-uraian-tugas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugas(@Valid @RequestBody UraianTugasVO vo, HttpServletRequest request) { try { Map result = uraianTugasService.saveUraianTugas(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUraianTugas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUraianTugas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-kategory-tugas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kategory-tugas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKategoryTugas(@Valid @RequestBody KategoryTugasVO vo, HttpServletRequest request) { try { Map result = KategoryTugasService.saveKategoryTugas(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKategoryTugas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKategoryTugas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-isian-pelamar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-isian-pelamar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveIsianPelamar(@Valid @RequestBody IsianPelamarVO vo, HttpServletRequest request) { try { Map result = IsianPelamarService.saveIsianPelamar(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveIsianPelamar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveIsianPelamar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-isian-pelamar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-isian-pelamar/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getIsianPelamar(HttpServletRequest request) { try { Map result = IsianPelamarService.findDataPelamar(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-asuransi-naker", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-asuransi-naker", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAsuransiNaker(@Valid @RequestBody AsuransiNakerVO vo, HttpServletRequest request) { try { Map result = AsuransiNakerService.saveAsuransiNaker(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveAsuransiNaker", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveAsuransiNaker", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-nama-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-nama-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveNamaPegawai(@Valid @RequestBody NamaPegawaiVO vo, HttpServletRequest request) { try { Map result = NamaPegawaiService.saveNamaPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveNamaPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveNamaPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-master-honor-tim", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-master-honor-tim", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMasterHonorTim(@Valid @RequestBody MasterHonorTimVO vo, HttpServletRequest request) { try { Map result = MasterHonorTimService.saveMasterHonorTim(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMasterHonorTim", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMasterHonorTim", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-master-jenis-santunan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-master-jenis-santunan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMasterJenisSantunan(@Valid @RequestBody MasterJenisSantunanVO vo, HttpServletRequest request) { try { Map result = MasterJenisSantunanService.saveMasterJenisSantunan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMasterJenisSantunan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMasterJenisSantunan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pernelitian-eksternal", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pernelitian-eksternal", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePernelitianEksternal(@Valid @RequestBody PernelitianEksternalVO vo, HttpServletRequest request) { try { Map result = PernelitianEksternalService.savePernelitianEksternal(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePernelitianEksternal", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePernelitianEksternal", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-perhitungan-honor-tim-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-honor-tim-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganHonorTimPegawai( @Valid @RequestBody PerhitunganHonorTimPegawaiVO vo, HttpServletRequest request) { try { Map result = PerhitunganHonorTimPegawaiService.savePerhitunganHonorTimPegawai(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerhitunganHonorTimPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerhitunganHonorTimPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jenis-honor", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jenis-honor", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJenisHonor(@Valid @RequestBody JenisHonorVO vo, HttpServletRequest request) { try { Map result = JenisHonorService.saveJenisHonor(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJenisHonor", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJenisHonor", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-tahun-umr", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-tahun-umr", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveTahunUmr(@Valid @RequestBody TahunUmrVO vo, HttpServletRequest request) { try { Map result = TahunUmrService.saveTahunUmr(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveTahunUmr", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveTahunUmr", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-jenis-gaji", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jenis-gaji", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJenisGaji(@Valid @RequestBody JenisGajiVO vo, HttpServletRequest request) { try { Map result = JenisGajiService.saveJenisGaji(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJenisGaji", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJenisGaji", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/jenis-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jenis-gaji", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> listJenisGaji() { List listJenisGaji = (List) jenisGajiDao.findAll(); - return RestUtil.getJsonResponse(listJenisGaji); + return getJsonResponse(listJenisGaji); } - @RequestMapping(value = "/save-golongan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-golongan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveGolongan(@Valid @RequestBody GolonganVO vo, HttpServletRequest request) { try { Map result = GolonganService.saveGolongan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveGolongan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveGolongan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-gaji-pokok", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-gaji-pokok", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveGajiPokok(@Valid @RequestBody GajiPokokVO vo, HttpServletRequest request) { try { Map result = GajiPokokService.saveGajiPokok(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveGajiPokok", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveGajiPokok", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-indek-kinerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-indek-kinerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveIndekKinerja(@Valid @RequestBody List vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveIndekKinerja(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveIndekKinerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveIndekKinerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-indek-kinerja/{tahun}/{bulan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-indek-kinerja/{tahun}/{bulan}/{pegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByJadwal(@PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { try { Map result = indekKinerjaService.findPegawaiByRuangan(tahun, bulan, pegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/set-uraian-tugas/{id}/{bobot}/{target}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/set-uraian-tugas/{id}/{bobot}/{target}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> setBobot(@PathVariable("id") Integer id, @PathVariable("bobot") Integer bobot, @PathVariable("target") Integer target, HttpServletRequest request) { try { Map result = new HashMap<>(); - MapUraianTugasToRincianKegiatan model = mapUraianTugasToRincianKegiatanDao.findOne(id); model.setBobot(bobot.toString()); model.setTarget(target.toString()); @@ -1791,15 +1663,14 @@ public class SdmController extends LocaleController { model.setReportDisplay("-"); model.setKodeExternal("-"); mapUraianTugasToRincianKegiatanDao.save(model); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/add-uraian-tugas/{id}/{group}/{bobot}/{target}/{description}/{jabatanId}/{pegawaiId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/add-uraian-tugas/{id}/{group}/{bobot}/{target}/{description}/{jabatanId}/{pegawaiId}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> addBobot(@PathVariable("id") Integer id, @PathVariable("bobot") Integer bobot, @PathVariable("target") Integer target, @PathVariable("group") String group, @PathVariable("description") String description, @@ -1807,7 +1678,6 @@ public class SdmController extends LocaleController { HttpServletRequest request) { try { Map result = new HashMap<>(); - MapUraianTugasToRincianKegiatan model = mapUraianTugasToRincianKegiatanDao.findOne(id); model.setBobot(bobot.toString()); model.setTarget(target.toString()); @@ -1816,457 +1686,413 @@ public class SdmController extends LocaleController { model.setReportDisplay("-"); model.setKodeExternal("-"); mapUraianTugasToRincianKegiatanDao.save(model); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-jenis-kompetensi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jenis-kompetensi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJenisKompetensi(@Valid @RequestBody JenisKompetensiVO vo, HttpServletRequest request) { try { Map result = JenisKompetensiService.saveJenisKompetensi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJenisKompetensi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJenisKompetensi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-kompetensi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kompetensi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKompetensi(@Valid @RequestBody KompetensiVO vo, HttpServletRequest request) { try { Map result = KompetensiService.saveKompetensi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKompetensi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKompetensi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-kelompok-kompetensi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kelompok-kompetensi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokKompetensi(@Valid @RequestBody KelompokKompetensiVO vo, HttpServletRequest request) { try { Map result = KelompokKompetensiService.saveKelompokKompetensi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKelompokKompetensi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKelompokKompetensi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-faktor-evaluasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-faktor-evaluasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveFaktorEvaluasi(@Valid @RequestBody FaktorEvaluasiVO vo, HttpServletRequest request) { try { Map result = FaktorEvaluasiService.saveFaktorEvaluasi(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 ServiceVOExceptions {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveFaktorEvaluasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveFaktorEvaluasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-kelompok-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kelompok-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody NilaiKelompokJabatanVO vo, HttpServletRequest request) { try { Map result = kelompokJabatanService.saveNilaiKelompokJabatan(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 ServiceVOException {} when add kelompok jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveNilaiKelompokJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add kelompok jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveNilaiKelompokJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-plafon-remunerasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-plafon-remunerasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody PlafonRemunerasiKemenkeuVO vo, HttpServletRequest request) { try { Map result = kelompokJabatanService.saveNilaiKelompokJabatan(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 ServiceVOException {} when add plafon remunerasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveNilaiKelompokJabatan plafon", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add plafon remunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveNilaiKelompokJabatan plafon", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-range-kmk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-range-kmk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRangeKmk(@Valid @RequestBody RangeKmkVO vo, HttpServletRequest request) { try { Map result = RangeKmkService.saveRangeKmk(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRangeKmk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRangeKmk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-master-evaluasi-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-master-evaluasi-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMasterEvaluasiJabatan(@Valid @RequestBody MasterEvaluasiJabatanVO vo, HttpServletRequest request) { try { Map result = MasterEvaluasiJabatanService.saveMasterEvaluasiJabatan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMasterEvaluasiJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMasterEvaluasiJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/hitung-master-evaluasi-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/hitung-master-evaluasi-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> hitungMasterEvaluasiJabatan( @Valid @RequestBody MasterEvaluasiJabatanVO vo, HttpServletRequest request) { try { Map result = MasterEvaluasiJabatanService.hitungPoinEvaluasi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when hitungPoinEvaluasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when hitungPoinEvaluasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/hitung-grade-evaluasi-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/hitung-grade-evaluasi-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> hitungGradeEvaluasiJabatan(@Valid @RequestBody EvaluasiJabatanVO vo, HttpServletRequest request) { try { Map result = evaluasiJabatanService.hitungPoinEvaluasi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when hitungPoinEvaluasi grade", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when hitungPoinEvaluasi grade", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-list-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListJabatan(HttpServletRequest request) { try { Map result = MasterEvaluasiJabatanService.findJabatan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-by-jabatan/{idJabatan}/{bulan}/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-by-jabatan/{idJabatan}/{bulan}/{tahun}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListByJabatan(@PathVariable("idJabatan") Integer idJabatan, @PathVariable("bulan") String bulan, @PathVariable("tahun") Integer tahun, HttpServletRequest request) { try { Map result = MasterEvaluasiJabatanService.findEvaluasiByJabatan(idJabatan, tahun, bulan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-evaluasi-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-evaluasi-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveEvaluasiJabatan(@Valid @RequestBody EvaluasiJabatanVO vo, HttpServletRequest request) { try { Map result = evaluasiJabatanService.saveEvaluasiJabatan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveEvaluasiJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemExceptions {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemExceptions {} when saveEvaluasiJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-evaluasi-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getEvaluasiJabatan(@RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "bulan") String bulan, @RequestParam(value = "ruangan") Integer ruangan, HttpServletRequest request) { try { Map result = evaluasiJabatanService.findEvaluasiJabatan(tahun, bulan, ruangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-count-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-count-evaluasi-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getCountEvaluasiJabatan(@RequestParam(value = "tahun") Integer tahun, HttpServletRequest request) { try { Map result = evaluasiJabatanService.CountEvaluasi(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-rekap", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekap", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRekap(@RequestParam(value = "tahun") Integer tahun, HttpServletRequest request) { try { Map result = evaluasiJabatanService.findPegawaiByTahun(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-evaluasi-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-evaluasi-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getEvaluasiPegawai(@RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "bulan") Integer bulan, HttpServletRequest request) { try { Map result = evaluasiJabatanService.findPegawaiByTahun(tahun, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-simulasi-pendapatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-simulasi-pendapatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveSimulasiPendapatan(@Valid @RequestBody SimulasiPendapatanVO vo, HttpServletRequest request) { try { Map result = simulasiPendapatanService.saveSimulasiPendapatan(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSimulasiPendapatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveSimulasiPendapatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-save-simulasi-pendapatan/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-save-simulasi-pendapatan/{tahun}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getsaveSimulasiPendapatan(@PathVariable("tahun") Integer tahun, HttpServletRequest request) { try { Map result = simulasiPendapatanService.findByTahun(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-perhitungan-abk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-abk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganAbk(@Valid @RequestBody List vo, HttpServletRequest request) { try { Map result = PerhitunganAbkService.savePerhitunganAbk(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePerhitunganAbk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePerhitunganAbk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-perhitungan-abk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-perhitungan-abk", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPerhitunganAbk(@RequestParam(value = "tahun") Integer tahun, HttpServletRequest request) { try { Map result = PerhitunganAbkService.findByTahun(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-jadwal-orientasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jadwal-orientasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJadwalOrientasi(@Valid @RequestBody JadwalOrientasiVO vo, HttpServletRequest request) { try { Map result = jadwalOrientasiService.saveJadwalOrientasi(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 ServiceVOException {} when add Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveJadwalOrientasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveJadwalOrientasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-save-jadwal-orientasi/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-save-jadwal-orientasi/{nama}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getsaveJadwalOrientasi(@PathVariable("nama") String nama, HttpServletRequest request) { try { Map result = jadwalOrientasiService.findByName(nama); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-tindakan-by-user-id/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-tindakan-by-user-id/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByUserId(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { List> result = indekKinerjaService.findByUserId(startDate, endDate); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-tindakan-by-period/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-tindakan-by-period/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanByPeriod( @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = indekKinerjaService.findAllTindakanByPeriod(idPegawai); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-logbook-summary-by-user-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-logbook-summary-by-user-id", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getLogbookSummaryByUserId( @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idTindakan") Integer idProduk, @@ -2274,318 +2100,292 @@ public class SdmController extends LocaleController { try { List> result = indekKinerjaService.findTindakanByUserId(idPegawai, startDate, endDate, idProduk); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-tindakan-by-user-id-and-periode/{month}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-tindakan-by-user-id-and-periode/{month}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByIdUserAndPeriod(@PathVariable("month") String month, HttpServletRequest request) { try { List> result = indekKinerjaService.findTindakanByIdUserAndPeriod(month); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-uraian-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-uraian-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerja(HttpServletRequest request) { try { - List> result = indekKinerjaService.findUraianTugas();// validasitargetbobotnull - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + List> result = indekKinerjaService.findUraianTugas(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-persen-uraian-kerja/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-persen-uraian-kerja/{idPegawai}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPersen(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { List> result = indekKinerjaService.findCountTindakanByIdUserAndPeriod(idPegawai, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-detail-poin/{tgl}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-poin/{tgl}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDetailPoin(@PathVariable("tgl") String tgl, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = indekKinerjaService.detailPoin(tgl, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-rekap-poin/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekap-poin/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRekapPoin(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = indekKinerjaService.rekapPoin(month, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-uraian-tugas-transaksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-uraian-tugas-transaksi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugasTransaksi(@Valid @RequestBody UraianTugasCustomVO vo, HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveUraianTugas(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUraianTugas transaksi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUraianTugas transaksi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-indek-kinerja-kuantitas/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-indek-kinerja-kuantitas/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getIndekKinerjaKuantitas(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, @RequestParam(value = "isNew", required = false) Boolean isNew, HttpServletRequest request) { try { Map result = indekKinerjaService.getIndekKinerjaKuantitasData(month, idPegawai, isNew); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-rekapitulasi-capaian/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekapitulasi-capaian/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRekapitulasiCapaian(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = indekKinerjaService.getRekapitulasiCapaianUraianTugas(month, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-uraian-kerja-dan-capaian/{date}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-uraian-kerja-dan-capaian/{date}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerjaDanCapaian(@PathVariable("date") String date, HttpServletRequest request) { try { List> result = indekKinerjaService.findUraianTugasByTanggal(date); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-target-bobot-uraian-kerja/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-target-bobot-uraian-kerja/{idPegawai}/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getTargetBobotUraianKerja(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.findTargetAndBobot(idPegawai, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-id-pgw", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-id-pgw", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getIDs(HttpServletRequest request) { try { Pegawai result = indekKinerjaService.getPegawaiByUserLogin(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-target-bobot-uraian-tugas-transaksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-target-bobot-uraian-tugas-transaksi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveTargetBobotUraianTugasTransaksi( @Valid @RequestBody UraianTugasCustomVO vo, HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveTargetBobotUraianTugas(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveTargetBobotUraianTugas", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveTargetBobotUraianTugas", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-indeks-kinerja-individu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-indeks-kinerja-individu", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveIndeksKinerjaindividu(@Valid @RequestBody IndeksKinerjaIndividuVO vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveIndekKinerjaIndividu(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveIndekKinerjaIndividu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveIndekKinerjaIndividu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-list-indeks-kinerja-individu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-list-indeks-kinerja-individu", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveListIndeksKinerjaindividu( @Valid @RequestBody IndeksKinerjaIndividuCustomVO vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveAllIndekKinerja(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveAllIndekKinerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveAllIndekKinerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-kualitas-inovasi-IKI/{periode}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kualitas-inovasi-IKI/{periode}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKualitasAndInovasi(@PathVariable("periode") String periode, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = indekKinerjaService.findKualitasAndInovasi(periode, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-detail-presensi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-presensi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailPresensi(HttpServletRequest request, @RequestParam(value = "listTrNo") List listTrNo) { try { List> result = absensiPegawaiService.findDetailPresensi(listTrNo); 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 ServiceVOException {} when get detail presensi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get detail presensi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-reverse-geocoding", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-reverse-geocoding", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getReverseGeocoding(HttpServletRequest request, @RequestParam(value = "latitude") Double latitude, @RequestParam(value = "longitude") Double longitude) { try { String result = absensiPegawaiService.findReverseGeocoding(latitude, longitude); 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 ServiceVOException {} when get reverse geocoding", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get reverse geocoding", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-monitoring-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-monitoring-absen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMonitoringAbsen(@Valid @RequestBody MonitoringAbsenCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveMonitoring(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMonitoring", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMonitoring", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-kehadiran-iki/{periode}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran-iki/{periode}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranIKI(@PathVariable("periode") String periode, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = indekKinerjaService.findKehadiran(periode, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-presensi-kehadiran", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-presensi-kehadiran", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPresensiKehadiran(HttpServletRequest request, @RequestParam(value = "unitKerjaId", required = false) Integer idUnitKerja, @RequestParam(value = "subunitKerjaId", required = false) Integer idSubunitKerja, @@ -2596,604 +2396,573 @@ public class SdmController extends LocaleController { Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, idSubunitKerja, idPegawai, startDate, endDate); if (result != null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get presensi kehadiran", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get presensi kehadiran", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran/{idPegawai}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.jumlahKehadiran(null, null, idPegawai, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranByRuangan(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, null, null, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{idSubUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{idSubUnitKerja}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranByRuangan(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("idSubUnitKerja") Integer idSubUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, idSubUnitKerja, null, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-kehadiran-all-pegawai/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran-all-pegawai/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findAllKehadiran(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.findKehadiranAllPegawai(startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-rekap-IKI/{idRuangan}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekap-IKI/{idRuangan}/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findRekapIKI(@PathVariable("idRuangan") Integer idRuangan, @PathVariable("periode") String periode, HttpServletRequest request) { try { Map result = indekKinerjaService.rekapIKI(idRuangan, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-penilaian-kompetensi/{idJabatan}/{tglPenilaian}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-penilaian-kompetensi/{idJabatan}/{tglPenilaian}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findRekapIKI(@PathVariable("idJabatan") Integer idJabatan, @PathVariable("tglPenilaian") String tglPenilaian, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = riwayatPenilaianKompetensiPegawaiService .getPenilaianKompetensiPegawai(idJabatan, tglPenilaian, idPegawai);// bp - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-penilaian-kompetensi-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-penilaian-kompetensi-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePenilaianKompetensiPegawai(@Valid @RequestBody StrukHistoriVO vo, HttpServletRequest request) { try { Map result = riwayatPenilaianKompetensiPegawaiService.savePenilaianKompetensiPegawai(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePenilaianKompetensiPegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePenilaianKompetensiPegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-input-daftar-paket-pelatihan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-input-daftar-paket-pelatihan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveInputDaftarPaketPelatihan( @Valid @RequestBody InputDaftarPaketPelatihanVO vo, HttpServletRequest request) { Map result = inputDaftarPaketPelatihanService.saveInputDaftarPaketPelatihan(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); } - @RequestMapping(value = "/save-input-daftar-paket-seminar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-input-daftar-paket-seminar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveInputDaftarPaketSeminar( @Valid @RequestBody InputDaftarPaketSeminarVO vo, HttpServletRequest request) { Map result = inputDaftarPaketSeminarService.saveInputDaftarPaketSeminar(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); } - @RequestMapping(value = "/get-login-user-musare", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-login-user-musare", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUserLogin(HttpServletRequest request) { try { Map result = serviceMusare.getUserLogin(); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getUserLogin", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getUserLogin musare", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getUserLogin", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getUserLogin musare", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-by-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-by-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataByPegawai(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = serviceMusare.getDataMuSaReByPegawai(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataByPegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataByPegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-pengajuan-mutasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-pengajuan-mutasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanMutasi( @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanMutasi(ruanganId); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when loadPagePengajuanMutasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when loadPagePengajuanMutasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pengajuan-mutasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pengajuan-mutasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePengajuanMutasi(@Valid @RequestBody PlanningPegawaiMuSaReVO vo, HttpServletRequest request) { try { Map result = serviceMusare.savePengajuanMutasi(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 ServiceVOException {} when savePengajuanMutasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanMutasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-pengajuan-mutasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pengajuan-mutasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPengajuanMutasi(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanMutasi(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPengajuanMutasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPengajuanMutasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-pengajuan-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-pengajuan-sanksi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanSanksi( @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanSanksi(ruanganId); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when loadPagePengajuanSanksi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when loadPagePengajuanSanksi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pengajuan-sanksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pengajuan-sanksi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePengajuanSanksi(@Valid @RequestBody PlanningPegawaiMuSaReVO vo, HttpServletRequest request) { try { Map result = serviceMusare.savePengajuanSanksi(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 ServiceVOException {} when savePengajuanSanksi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanSanksi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-pengajuan-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pengajuan-sanksi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPengajuanSanksi(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanSanksi(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPengajuanSanksi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPengajuanSanksi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-pengajuan-resign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-pengajuan-resign", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanResign( @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanResign(ruanganId); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when loadPagePengajuanResign", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when loadPagePengajuanResign", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pengajuan-resign", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pengajuan-resign", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePengajuanResign(@Valid @RequestBody PlanningPegawaiMuSaReVO vo, HttpServletRequest request) { try { Map result = serviceMusare.savePengajuanResign(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 ServiceVOException {} when savePengajuanResign", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanResign", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-pengajuan-resign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pengajuan-resign", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPengajuanResign(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanResign(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPengajuanResign", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPengajuanResign", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-pengajuan-musare", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pengajuan-musare", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListDaftarMuSaRe( @RequestParam(value = "namaPegawai") String namaPegawai, HttpServletRequest request) { try { Map result = serviceMusare.getListDaftarMuSaRe(namaPegawai); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListDaftarMuSaRe", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListDaftarMuSaRe", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/verifikasi-pengajuan-musare", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/verifikasi-pengajuan-musare", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> ApprovalMusare(@Valid @RequestBody PlanningPegawaiMuSaReVO vo, HttpServletRequest request) { try { Map result = serviceMusare.ApprovalMusare(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 ServiceVOException {} when ApprovalMusare", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when ApprovalMusare", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/unverif-pengajuan-musare", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/unverif-pengajuan-musare", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> unVerifMusare(@Valid @RequestBody PlanningPegawaiMuSaReVO vo, HttpServletRequest request) { try { Map result = serviceMusare.unVerifMusare(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 ServiceVOException {} when unVerifMusare", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when unVerifMusare", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-history-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-history-sanksi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecSanksi( @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecSanksi(pegawaiId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getHistoryExecSanksi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getHistoryExecSanksi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-history-pangkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-history-pangkat", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecPangkat( @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecPangkat(pegawaiId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getHistoryExecPangkat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getHistoryExecPangkat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-history-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-history-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecJabatan( @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecJabatan(pegawaiId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getHistoryExecJabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getHistoryExecJabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-login-user-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-login-user-permohonan-status", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUserLoginPermohonanStatus(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = servicePermohonanStatus.getUserLogin(idPegawai); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when servicePermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getUserLogin", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when servicePermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getUserLogin", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-jabatan-login-user", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jabatan-login-user", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJabatanUserLogin(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = servicePermohonanStatus.getUserLogin(idPegawai); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when servicePermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when servicePermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-permohonan-status", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData( @RequestParam(value = "subUnitKerjaId") Integer subUnitKerjaId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getLoadData(subUnitKerjaId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-cuti", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getDataCuti(@RequestParam(value = "pegawaiId") Integer pegawaiId, @RequestParam(value = "year", required = false) String year, @RequestParam(value = "statusPegawaiId") Integer statusPegawaiId, @@ -3201,157 +2970,150 @@ public class SdmController extends LocaleController { HttpServletRequest request) { try { DataCutiDto dto = jatahCutiDanIzinService.getDataCuti(pegawaiId, year, statusPegawaiId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(dto, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataCuti", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataCuti", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/perbarui-data-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/perbarui-data-cuti", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity perbaruiDataCuti(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "year", required = false) String year, @RequestParam(value = "statusPegawaiId") Integer idStatusPegawai) { try { DataCutiDto dto = servicePermohonanStatus.perbaruiDataCuti(idPegawai, idStatusPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_UPDATE_DATA_CUTI, request)); - return RestUtil.getJsonResponse(dto, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_UPDATE_DATA_CUTI, request)); + return getJsonResponse(dto, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when perbaruiDataCuti", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when perbaruiDataCuti", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPermohonanStatus( @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getDataPermohonanStatus(pegawaiId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-map-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-map-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataMPermohonanStatus( @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getDataMapPermohonanStatus(pegawaiId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getDataPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getDataPermohonanStatus map", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getDataPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getDataPermohonanStatus map", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-permohonan-status", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPermohonanStatus( @RequestParam(value = "unitKerjaId", required = false) Integer unitKerjaId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getListPermohonanStatus(unitKerjaId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-approval-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-approval-status", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListApprovalStatus( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getApprovalStatus(idPegawai); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListApprovalStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListApprovalStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-tanggal-permohonan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-tanggal-permohonan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListTanggalPermohonan( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = servicePermohonanStatus.getListTanggalPermohonan(idPegawai); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getListTanggalPermohonan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getListTanggalPermohonan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-approval-status-paging", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-approval-status-paging", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListApprovalStatusPaging( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "5") Integer limit, @@ -3370,48 +3132,46 @@ public class SdmController extends LocaleController { idPegawai, nama, jenisPermohonan, statusPermohonan, tglPermohonan, isCutiLuarNegeri, isCutiLuarKota); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getListApprovalStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListApprovalStatus paging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getListApprovalStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListApprovalStatus paging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-approval-status-by-planning", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-approval-status-by-planning", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListApprovalStatusByNorecPlanning( @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "noRec") String noRec, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getApprovalStatusByNorecPlanning(idPegawai, 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getListApprovalStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListApprovalStatus by planning", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getListApprovalStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListApprovalStatus by planning", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-approval-status-by-status-pegawai-plan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-approval-status-by-status-pegawai-plan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getApprovalStatusByStatusPegawaiPlan( @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "statusPegawaiPlanId", required = false) Integer statusPegawaiPlanId, @@ -3420,24 +3180,23 @@ public class SdmController extends LocaleController { Map result = servicePermohonanStatus.getApprovalStatusByStatusPegawaiPlan(idPegawai, statusPegawaiPlanId); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getListApprovalStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListApprovalStatus by pegawai", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getListApprovalStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListApprovalStatus by pegawai", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pegawai-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai-status", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePlanningPegawaiStatus(@Valid @RequestBody PlanningPegawaiStatusVO vo, HttpServletRequest request) { try { @@ -3448,28 +3207,27 @@ public class SdmController extends LocaleController { if (CommonUtil.isNotNullOrEmpty(statusTanggalPermohonan) && !statusTanggalPermohonan) { result.put("bisaCuti", false); result.put("status", "Tanggal Permohonan sudah pernah diajukan!"); // Validasi_tanggal_permohonan_yang_sudah_diajukan - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } result = servicePermohonanStatus.savePlanningPegawaiStatus(vo); if (CommonUtil.isNotNullOrEmpty(result.get("noRec"))) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePlanningPegawaiStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePlanningPegawaiStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pegawai-status-rev", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai-status-rev", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePlanningPegawaiStatusRev( @Valid @RequestBody PlanningPegawaiStatusVO vo, HttpServletRequest request) { try { @@ -3481,68 +3239,65 @@ public class SdmController extends LocaleController { if (CommonUtil.isNotNullOrEmpty(statusTanggalPermohonan) && !statusTanggalPermohonan) { result.put("bisaCuti", false); result.put("status", "Tanggal Permohonan sudah pernah diajukan!"); // Validasi_tanggal_permohonan_yang_sudah_diajukan - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } else { result = servicePermohonanStatus.savePlanningPegawaiStatus(vo); if (CommonUtil.isNotNullOrEmpty(result.get("noRec"))) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when savePlanningPegawaiStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePlanningPegawaiStatus rev", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when savePlanningPegawaiStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePlanningPegawaiStatus rev", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/update-pegawai-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-pegawai-status", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> updatePlanningPegawaiStatus( @Valid @RequestBody PlanningPegawaiStatusVO vo, HttpServletRequest request) { try { Map result = servicePermohonanStatus.updatePlanningPegawaiStatus(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 ServiceVOException {} when update PlanningPegawaiStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updatePlanningPegawaiStatus", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when update PlanningPegawaiStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updatePlanningPegawaiStatus", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/delete-pegawai-status/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-pegawai-status/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> deletePlanningPegawaiStatus(@RequestParam(value = "noRec") String noRec, HttpServletRequest request) { try { Map result = servicePermohonanStatus.deletePlanningPegawaiStatus(noRec); 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 ServiceVOException {} when update PlanningPegawaiStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update PlanningPegawaiStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/approval-permohonan-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/approval-permohonan-status", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> approvalPermohonanStatus(@Valid @RequestBody PlanningPegawaiStatusVO vo, HttpServletRequest request) { try { @@ -3557,572 +3312,539 @@ public class SdmController extends LocaleController { servicePermohonanStatus.setJatahCutiPegawaiRecursive(cutiVo); } 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 ServiceVOException {} when approvalPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when approvalPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/unverif-permohonan-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/unverif-permohonan-status", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> unVerifPermohonanStatus(@Valid @RequestBody PlanningPegawaiStatusVO vo, HttpServletRequest request) { try { Map result = servicePermohonanStatus.unVerifPermohonanStatus(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 ServiceVOException {} when unVerifPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when unVerifPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-periode-golongan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-periode-golongan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPeriodeRekap(HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getPeriodeGolongan(); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPeriodeRekap", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPeriodeRekap", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-gaji-pns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-gaji-pns", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDaftarGajiPns(@RequestParam(value = "periode") String periode, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDaftarGajiPns(periode); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getStrukHistori", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getStrukHistori", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-detail-gaji-pns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-gaji-pns", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDtailGajiPns(@RequestParam(value = "noRec") String noRec, @RequestParam(value = "id") Integer id, @RequestParam(value = "periode") String periode, @RequestParam(value = "namaPegawai") String namaPegawai, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDtailGajiPns(noRec, id, namaPegawai, periode); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDataGajiPegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDataGajiPegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-gaji-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-gaji-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDaftarGajiPkwt(@RequestParam(value = "periode") String periode, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDaftarGajiPkwt(periode); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDaftarGajiPkwt", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDaftarGajiPkwt", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-detail-gaji-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-gaji-pkwt", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDtailGajiPkwt(@RequestParam(value = "noRec") String noRec, @RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDtailGajiPkwt(noRec, id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getDtailGajiPkwt", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getDtailGajiPkwt", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-gap-kompetensi/{idRuangan}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-gap-kompetensi/{idRuangan}/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findGapKompetensi(@PathVariable("idRuangan") Integer idRuangan, @PathVariable("periode") String periode, HttpServletRequest request) { try { List> result = riwayatPenilaianKompetensiPegawaiService .getGapKompetensiPegawai(idRuangan, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-kompetensi-by-ruangan/{idRuangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kompetensi-by-ruangan/{idRuangan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findGapKompetensi(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) { try { Map result = riwayatPenilaianKompetensiPegawaiService.getKompetensiPegawai(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-rekap-kehadiran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-rekap-kehadiran", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRekapKehadiran(@Valid @RequestBody StrukHistoriVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveRekapKomponen(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 ServiceVOException {} when add rekapKehadiran", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRekapKomponen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add rekapKehadiran", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRekapKomponen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-total-index-kehadiran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-total-index-kehadiran", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveTotalIndexKehadiran(@Valid @RequestBody StrukHistoriVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveTotalIndexRekapitulasiKehadiran(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 ServiceVOException {} when add rekapKehadiran", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add rekapKehadiran", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-factor-rate-kelompok-Shift", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-factor-rate-kelompok-Shift", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveFactorRateKelompokShift( @Valid @RequestBody KelompokShiftKerjaCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveFactorRate(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 ServiceVOException {} when add factor rate", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add factor rate", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-rencana-tindak-lanjut", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rencana-tindak-lanjut", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findRencanaTindakLanjut(HttpServletRequest request) { try { List> result = riwayatPenilaianKompetensiPegawaiService.getRencanaTindakLanjut(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/rekap-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/rekap-kehadiran/{idPegawai}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.rekapitulasiKehadiranAllPegawai(idPegawai, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiranByUnitKerja( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerja(idUnitKerja, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja-rescored/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja-rescored/{idUnitKerja}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiranByUnitKerjaRev( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerjaRev(idUnitKerja, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/rekap-index-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/rekap-index-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> rekapIndeksKehadiranByUnitKerja( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.rekapitulasiIndeksKehadiranByunitKerja(idUnitKerja, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/rekap-index-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/rekap-index-kehadiran/{idPegawai}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> rekapIndeksKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.rekapitulasiIndexKehadiranAllPegawai(idPegawai, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-komponen-index", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-komponen-index", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListKomponenIndex(HttpServletRequest request) { try { List> result = shiftKerjaService.getListKomponenIndex(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-jadwal-Kerja/{idRuangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-jadwal-Kerja/{idRuangan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJadwalKerja(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) { try { List> result = pegawaiJadwalKerjaService.getShiftKerja(idRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-pegawai-jadwal-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pegawai-jadwal-kerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveapegawaiJadwalKerja( @Valid @RequestBody PegawaiJadwalKerjaCustomVO vo, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaService.saveJadwalKerja(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 ServiceVOException {} when add Pegawai Jadwal kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add Pegawai Jadwal kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-shift-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-shift-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListShiftKerja(HttpServletRequest request) { try { List> result = shiftKerjaService.getListShiftKerja(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-keterangan-shift", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-keterangan-shift", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListKetShift(HttpServletRequest request) { try { List> result = shiftKerjaService.getListKetShift(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-factor-rate-shift-kerja/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-factor-rate-shift-kerja/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListFactorRateShiftKerja(HttpServletRequest request, @PathVariable("periode") String periode) { try { List> result = monitoringAbsenService.findFactorRateIndekkehadiran(periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } // Get data list Jabatan Evaluasi - @RequestMapping(value = "/get-list-master-evaluasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-master-evaluasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListMasterJabatanEvaluasiByTahunBulan( @RequestParam(value = "tahun", required = false) Integer tahun, @RequestParam(value = "bulan", required = false) String bulan, HttpServletRequest request) { try { Map result = evaluasiJabatanService.findEvaluasiJabatanTahun(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-kehadiran-lembur-sdm/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran-lembur-sdm/{idPegawai}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranLemburKerjaSdm(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { try { Map result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, startDate, endDate); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-kehadiran-lembur-sdm-by-periode/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kehadiran-lembur-sdm-by-periode/{idPegawai}/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranLemburKerjaSdm(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { try { Map result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-input-lembur-verifikasi-sdm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-input-lembur-verifikasi-sdm", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveInputLemburVerifikasiSdm( @Valid @RequestBody InputLemburSdmCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveLemburVerifikasiSdm(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveLemburVerifikasiSdm", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveLemburVerifikasiSdm", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-pegawai-aktif-verified-by-unitkerja/{period}", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-pegawai-aktif-verified-by-unitkerja/{period}", method = GET) public ResponseEntity> getAllPegawaiAktifVerfiedByUnitKerja(@PathVariable("period") String period, HttpServletRequest request) { try { List listPegawaiVo = monitoringAbsenService.findPegawaiAktifAndVerifiedByUnitKerja(period); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getAllPegawaiAktifVerfiedByUnitKerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findPegawaiAktifAndVerifiedByUnitKerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getAllPegawaiAktifVerfiedByUnitKerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findPegawaiAktifAndVerifiedByUnitKerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-running-text-struk-histori/", method = RequestMethod.GET) + @RequestMapping(value = "/get-running-text-struk-histori/", method = GET) public ResponseEntity getRunningTextStrukHistori(HttpServletRequest request) { try { String runningNumber = monitoringAbsenService.getRunningNumberStrukHistori(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(runningNumber, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(runningNumber, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getAllPegawaiAktifVerfiedByUnitKerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getRunningNumberStrukHistori", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getAllPegawaiAktifVerfiedByUnitKerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getRunningNumberStrukHistori", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-lembur-by-priod/{period}", method = RequestMethod.GET) + @RequestMapping(value = "/get-pegawai-lembur-by-priod/{period}", method = GET) public ResponseEntity>> getPegawaiLemburByPeriod(@PathVariable("period") String period, HttpServletRequest request) { try { List> runningNumber = monitoringAbsenService.findJumlahLembur(period); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(runningNumber, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(runningNumber, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllPegawaiAktifVerfiedByUnitKerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllPegawaiAktifVerfiedByUnitKerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-perhitungan-uang-lembur", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-perhitungan-uang-lembur", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveUangLembur(@Valid @RequestBody Set vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveUangLembur(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUangLembur", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUangLembur", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-poin-dokter/{idUnitKerja}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-poin-dokter/{idUnitKerja}/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPoinDokter(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("periode") String periode, HttpServletRequest request) { try { List> result = indekKinerjaService.getIndekKinerjaKuantitasPerUnitKerja(periode, idUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/menangguhkan-permohonan-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/menangguhkan-permohonan-status", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> menangguhkanVerifPermohonanStatus( @Valid @RequestBody PlanningPegawaiStatusVO vo, HttpServletRequest request) { try { @@ -4137,44 +3859,42 @@ public class SdmController extends LocaleController { servicePermohonanStatus.setJatahCutiPegawaiRecursive(cutiVo); } 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 ServiceVOException {} when unVerifPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when unVerifPermohonanStatus penangguhan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when unVerifPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when unVerifPermohonanStatus penangguhan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-permohonan-status-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-permohonan-status-cuti", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPermohonanStatusCuti(@RequestParam("isSdm") Boolean isSdm, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getListPermohonanStatusPegawai(isSdm); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getListPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListPermohonanStatus cuti", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getListPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListPermohonanStatus cuti", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-permohonan-status-cuti-paging", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-permohonan-status-cuti-paging", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListPermohonanStatusCutiPaging( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "5") Integer limit, @@ -4194,125 +3914,118 @@ public class SdmController extends LocaleController { dir, idPegawai, nama, jenisPermohonan, statusPermohonan, tglPermohonan, isSdm, isCutiLuarNegeri, isCutiLuarKota); 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(null, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when getListPermohonanStatus", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getListPermohonanStatus cuti paging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when getListPermohonanStatus", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getListPermohonanStatus cuti paging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-jatah-cuti-dan-izin", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jatah-cuti-dan-izin", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJatahCutiDanIzin(@Valid @RequestBody KelompokShiftKerjaCustomVO vo, HttpServletRequest request) { try { Map result = servicePermohonanStatus.setJatahCutiRecursive(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 ServiceVOException {} when add jatahCuti", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add jatahCuti", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-jatah-cuti-dan-izin-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-jatah-cuti-dan-izin-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJatahCutiDanIzinPegawai(@Valid @RequestBody JatahCutiDanIzinVO vo, HttpServletRequest request) { try { Map result = servicePermohonanStatus.setJatahCutiPegawaiRecursive(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_UPDATE_DATA_CUTI, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_UPDATE_DATA_CUTI, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add jatahCuti pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add jatahCuti pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-mapping-pegawai-to-atasan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-mapping-pegawai-to-atasan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveMappingPegawaiToJabatan( @Valid @RequestBody List vo, HttpServletRequest request) { try { Map result = mappingPegawaiToAtasanService.saveMappingPegawaiToAtasan(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveMappingPegawaiToAtasan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveMappingPegawaiToAtasan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-bawahan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-bawahan/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaibawahan(@PathVariable("id") Integer id, HttpServletRequest request) { try { List> result = mappingPegawaiToAtasanService.getPegawaibawahan(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-mapping-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-mapping-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getMappingPegawai(HttpServletRequest request) { try { List> result = mappingPegawaiToAtasanService.getMappingpegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-pegawai-atasan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-atasan/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaiAtasan(@PathVariable("id") Integer id, HttpServletRequest request) { try { List> result = mappingPegawaiToAtasanService.getPegawaiAtasan(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-atasan-langsung-as-pejabat-penilai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-atasan-langsung-as-pejabat-penilai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAtasanLangsungAsPejabatPenilai( @RequestParam(value = "idAtasanLangsung") Integer idAtasanLangsung, HttpServletRequest request) { List> result = new ArrayList<>(); @@ -4320,377 +4033,353 @@ public class SdmController extends LocaleController { Map data = mappingPegawaiToAtasanService .findAtasanLangsungAsPejabatPenilai(idAtasanLangsung); result.add(data); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/save-rincian-kegiatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-rincian-kegiatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatan(@Valid @RequestBody RincianKegiatanVO vo, HttpServletRequest request) { try { Map result = uraianTugasService.saveRincianKegiatan(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 ServiceVOException {} when add rincian kegiatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveRincianKegiatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add rincian kegiatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveRincianKegiatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-map-rincian-kegiatan-to-uraian-tugas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-map-rincian-kegiatan-to-uraian-tugas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatanToUraianTugas(@Valid @RequestBody UraianTugasMVO vo, HttpServletRequest request) { try { Map result = uraianTugasService.saveUraianTugasNew(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 ServiceVOException {} when add rincian kegiatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add rincian kegiatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/rekam-uraian-rincian-kegiatan-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/rekam-uraian-rincian-kegiatan-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRekamUraianRincianKegiatan( @Valid @RequestBody RekamUraianRincianKegiatanVO vo, HttpServletRequest request) { try { Map result = rekamUraianRincianKegiatanService.saveUraianRincianKegiatan(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 ServiceVOException {} when rekam uraian rincian kegiatan pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when rekam uraian rincian kegiatan pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-acuan-indeks-iki", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-acuan-indeks-iki", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAcuanIndeksIKI(@Valid @RequestBody List vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveTabelAcuanIndeksIKI(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 ServiceVOException {} when add acuan indeks iki", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when acuan indeks iki", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-acuan-iki", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-acuan-iki", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllAcuan(HttpServletRequest request) { try { List> result = indekKinerjaService.findAcuanIndeksIKI(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-indeks-iki/{nilai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-indeks-iki/{nilai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getIndeksIKI(@PathVariable("nilai") Double nilai, HttpServletRequest request) { try { Double result = indekKinerjaService.getIndeksIKI(nilai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-uraian-tugas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-uraian-tugas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllUT(HttpServletRequest request) { try { List> result = uraianTugasTransaksiService.findAllUraianTugas(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-uraian-kerja-by-jabatan/{idJabatan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-uraian-kerja-by-jabatan/{idJabatan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerjaByJabatan( @PathVariable("idJabatan") Integer idJabatan, HttpServletRequest request) { try { List> result = uraianTugasTransaksiService.getUraianTugasByJabatan(idJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-unit-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-unit-kerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatan(@Valid @RequestBody UnitKerjaPegawaiVO vo, HttpServletRequest request) { try { Map result = unitKerjaPegawaiService.saveUnitkerja(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 ServiceVOException {} when add unit kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveUnitkerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add unit kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveUnitkerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-unit-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllUnitKerja(HttpServletRequest request) { try { List result = unitKerjaPegawaiService.getAllUnitKerja(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-unit-kerja-by-name/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-unit-kerja-by-name/{name}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getUnitKerjaByName(@PathVariable("name") String name, HttpServletRequest request) { try { List result = unitKerjaPegawaiService.getUnitKerjaByName(name); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-habsen-manual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-habsen-manual", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveHabsenManual(@Valid @RequestBody MonitoringAbsenCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveAbsenManual(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 ServiceVOException {} when add habsen", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add habsen", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-sub-unit-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-sub-unit-kerja", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveSubUnitKerja(@Valid @RequestBody SubUnitKerjaPegawaiVO vo, HttpServletRequest request) { try { Map result = unitKerjaPegawaiService.saveSubUnitkerja(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 ServiceVOException {} when add unit kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSubUnitkerja", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add unit kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveSubUnitkerja", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-sub-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-sub-unit-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllSubUnitKerja(HttpServletRequest request) { try { List> result = unitKerjaPegawaiService.getAllSubUnitKerja(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getSubunitKerjaByUnitKerja( @RequestParam(value = "idUnitKerjaPegawai") Integer idUnitKerjaPegawai, HttpServletRequest request) { try { List> result = unitKerjaPegawaiService .getAllSubunitKerjaByUnitKerja(idUnitKerjaPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-sub-unit-kerja-by-name/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-sub-unit-kerja-by-name/{name}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getSubUnitKerjaByName(@PathVariable("name") String name, HttpServletRequest request) { try { List> result = unitKerjaPegawaiService.getSubUnitKerjaByName(name); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getSubUnitKerjaByUnitKerja(@PathVariable("id") Integer id, HttpServletRequest request) { try { List> result = unitKerjaPegawaiService.getAllSubUnitKerjaByUnitKerja(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-habsen-manual/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-habsen-manual/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getHabsenManual(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = monitoringAbsenService.getByLoc_Code(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-tindakan-dokter-rescored/{month}/{idPegawai}/{idAlternatif}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-tindakan-dokter-rescored/{month}/{idPegawai}/{idAlternatif}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanReview(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, @PathVariable("idAlternatif") Integer idAlternatif, HttpServletRequest request) { try { List> result = indekKinerjaService.getAllTindakanByDokterReview(month, idPegawai, idAlternatif); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-tindakan-dokter/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-tindakan-dokter/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakan(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = indekKinerjaService.getAllTindakanByDokter(month, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-tindakan-dokter-fee-for-service-rescored/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-tindakan-dokter-fee-for-service-rescored/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanFeeForServiceReview( @PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = indekKinerjaService.getAllTindakanByDokterForfeeForServiceReview(month, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/get-pendapatan-fee-for-service/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pendapatan-fee-for-service/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPendapatanFeeForServiceReview( @PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = pendapatanService.getFeeForServiceDokter(month, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-tindakan-dokter-fee-for-service/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-tindakan-dokter-fee-for-service/{month}/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanFeeForService(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = indekKinerjaService.getAllTindakanByDokterForfeeForService(month, idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/get-detail-pasien/{idProduk}/{idKelompokPasien}/{idKelas}/{idPegawai}/{tgl}/{ffs}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-pasien/{idProduk}/{idKelompokPasien}/{idKelas}/{idPegawai}/{tgl}/{ffs}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailPasien(HttpServletRequest request, @PathVariable("idProduk") Integer idProduk, @PathVariable("idKelompokPasien") Integer idKelompokPasien, @PathVariable("idKelas") Integer idKelas, @PathVariable("tgl") String tgl, @PathVariable("ffs") Boolean ffs, @@ -4699,15 +4388,14 @@ public class SdmController extends LocaleController { try { List> result = indekKinerjaService.findPatientDetailForEveryTindakanReview(idProduk, idKelompokPasien, idKelas, idPegawai, tgl, ffs, diskon, statusDiskon); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-detail-pasien-ffs/{idProduk}/{idKelas}/{idKomponenHarga}/{idPegawai}/{tgl}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-pasien-ffs/{idProduk}/{idKelas}/{idKomponenHarga}/{idPegawai}/{tgl}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailPasienFfs(HttpServletRequest request, @PathVariable("idProduk") Integer idProduk, @PathVariable("idKelas") Integer idKelas, @PathVariable("idKomponenHarga") Integer idKomponenHarga, @PathVariable("tgl") String tgl, @@ -4716,306 +4404,284 @@ public class SdmController extends LocaleController { try { List> result = pendapatanService.getDetailFeeForServiceDokter(idProduk, idKelas, idKomponenHarga, idPegawai, tgl, diskon, statusDiskon); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-kelompok-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-kelompok-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllKelompokJabatan(HttpServletRequest request) { try { List> result = jabatanService.getKelompokJabatan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-jabatan-by-jenis-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-jabatan-by-jenis-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanByJenisJabatan(HttpServletRequest request, @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan) { try { List> result = jabatanService.findModelJabatan(idJenisJabatan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-jabatan-by-jenis-dan-unit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jabatan-by-jenis-dan-unit", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanByJenisDanUnitKerja(HttpServletRequest request, @RequestParam(value = "jenisJabatanId") Integer idJenisJabatan, @RequestParam(value = "unitKerjaId") Integer idUnitKerja) { try { List> result = jabatanService.findModelJabatan(idJenisJabatan, idUnitKerja); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-master-kelompok-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-master-kelompok-jabatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody KelompokJabatanVO vo, HttpServletRequest request) { try { Map result = jabatanService.saveKelompokJabatan(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 ServiceVOException {} when add unit kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveKelompokJabatan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add unit kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveKelompokJabatan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-kedudukan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-kedudukan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllKedudukan(HttpServletRequest request) { try { List> result = kedudukanService.getKedudukanByStatusEnabled(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-kategoriPegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-kategoriPegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllategoriPegawai(HttpServletRequest request) { try { Map result = kategoriPegawaiService.findAlls(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-golongan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-golongan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllGolongan(HttpServletRequest request) { try { List> result = GolonganService.getKedudukanByStatusEnabled(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-hari-libur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-hari-libur", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllHariLibur(HttpServletRequest request) { try { List> result = indekKinerjaService.getAllMapKalenderToHariLibur(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-hari-libur", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-hari-libur", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveHariLibur(@Valid @RequestBody MapKalenderToHariLiburVO vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveMapKalenderToHariLibur(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 ServiceVOException {} when add unit kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add unit kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-grade/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-grade/{id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getGrade(@PathVariable("id") Integer id, HttpServletRequest request) { try { Map result = kelompokJabatanService.getNilaiKelompokJabatan(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-detail-kelompok-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-kelompok-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailkelompokJabatan(HttpServletRequest request) { try { List> result = kelompokJabatanService.getAllByStatusEnabled(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-detail-history-pegawai/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-detail-history-pegawai/{noRec}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity getDetailHistoryPegawai(@PathVariable("noRec") String noRec, HttpServletRequest request) { try { RekamDataPegawaiCustomVO result = rekamDataPegawaiService.getDetailPerubahan(noRec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-history-pegawai/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-history-pegawai/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListHistoryPegawai(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = rekamDataPegawaiService.getListHistoryDatapegawai(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save-uraian-tugas-flexible", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-uraian-tugas-flexible", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugasFlexible(@Valid @RequestBody UraianTugasFlexibleVO vo, HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveUraianTugasFlexible(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 ServiceVOException {} when add UraianTugas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add UraianTugas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-list-uraian-tugas-flexible-by-date/{idPegawai}/{date}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-uraian-tugas-flexible-by-date/{idPegawai}/{date}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugas(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("date") String date, HttpServletRequest request) { try { List> result = uraianTugasTransaksiService.findAllUraianTugasToday(idPegawai, date); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-uraian-tugas-verified-monthly/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-uraian-tugas-verified-monthly/{idPegawai}/{periode}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugasMonthly( @PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { try { List> result = uraianTugasTransaksiService.findAllUraianTugasMonthly(idPegawai, periode); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-uraian-tugas-bawahan/{idAtasan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-uraian-tugas-bawahan/{idAtasan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugasBawahan( @PathVariable("idAtasan") Integer idAtasan, HttpServletRequest request) { try { List> result = uraianTugasTransaksiService.findAllUraianTugasBawahan(idAtasan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-jatah-cuti/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-jatah-cuti/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListJatahCuti(HttpServletRequest request) { try { List> result = servicePermohonanStatus.getAllDataCuti(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/jatah-cuti/{pegawai_id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jatah-cuti/{pegawai_id}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getListJatahCuti(HttpServletRequest request, @PathVariable("pegawai_id") Integer idPegawai) { try { List dtoList = servicePermohonanStatus.findByPegawai(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(dtoList, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(dtoList, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-all-jatah-cuti-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-jatah-cuti-pegawai/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListJatahCuti( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = servicePermohonanStatus.getAllDataCuti(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-list-penandatangan-surat-izin-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-penandatangan-surat-izin-cuti", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getListPenandaTanganSuratIzinCuti(HttpServletRequest request) { try { List> result = monitoringAbsenService.findListPenandaTangan(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-dataPegawai-rev", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-dataPegawai-rev", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataPegawaiRevMonitoring( @RequestParam(value = "idUnitKerja") Integer idUnitKerja, @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja, @@ -5023,15 +4689,14 @@ public class SdmController extends LocaleController { try { List> result = monitoringAbsenService.findDataPegawaiRev(idUnitKerja, idSubUnitKerja, idPegawaiLogin); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get-id-kalender", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-id-kalender", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getIdKalender(@RequestParam(value = "tanggal") String tanggal, HttpServletRequest request) { List> result = new ArrayList<>(); @@ -5039,49 +4704,46 @@ public class SdmController extends LocaleController { Map map = new HashMap<>(); map.put("idKalender", pegawaiJadwalKerjaService.findIdKalender(tanggal)); result.add(map); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-mapping-hari-libur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-mapping-hari-libur", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getMappingHariLibur(@RequestParam(value = "tahun") String tahun, HttpServletRequest request) { try { List> result = pegawaiJadwalKerjaService.findMappingHariLibur(tahun); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/non-shift-auto-jadwal-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/non-shift-auto-jadwal-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> autoSaveJadwalKerjaNonShift( @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaService.autoSaveJadwalKerjaNonShift(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add PegawaiJadwalKerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add PegawaiJadwalKerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-riwayat-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-riwayat-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRiwayatJabatan(@RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan, HttpServletRequest request) { Map result = new HashMap<>(); @@ -5093,30 +4755,28 @@ public class SdmController extends LocaleController { } else { result.put("dataJabatanFungsional", riwayatJabatanByPegawai); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-data-riwayat-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-riwayat-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataRiwayatJabatan( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { Map result = new HashMap<>(); try { List> riwayatJabatanByPegawai = riwayatJabatanService.findDataRiwayatJabatan(idPegawai); result.put("riwayatJabatanByPegawai", riwayatJabatanByPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-data-riwayat-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-riwayat-pendidikan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataRiwayatPendidikan( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { Map result = new HashMap<>(); @@ -5124,116 +4784,110 @@ public class SdmController extends LocaleController { List> riwayatPendidikanByPegawai = riwayatPendidikanService .findDataRiwayatPendidikan(idPegawai); result.put("riwayatPendidikanByPegawai", riwayatPendidikanByPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/save-program-kegiatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-program-kegiatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveProgramKegiatan(@Valid @RequestBody ProgramKegiatanVO vo, HttpServletRequest request) { try { Map result = remunerasiService.saveProgramKegiatan(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 ServiceVOException {} when add Program Kegiatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add Program Kegiatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-uraian-kegiatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-uraian-kegiatan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianKegiatan(@Valid @RequestBody UraianKegiatanVO vo, HttpServletRequest request) { try { Map result = remunerasiService.saveUraianKegiatan(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 ServiceVOException {} when add Uraian Kegiatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add Uraian Kegiatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-indikator-kualitas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-indikator-kualitas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveIndikatorKualitas(@Valid @RequestBody IndikatorKualitasVO vo, HttpServletRequest request) { try { Map result = remunerasiService.saveIndikatorKualitas(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 ServiceVOException {} when add Indikator Kualitas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add Indikator Kualitas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-kategori-penilaian-kualitas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kategori-penilaian-kualitas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveIndikatorKualitas(@Valid @RequestBody KategoriPenilaianKualitasVO vo, HttpServletRequest request) { try { Map result = remunerasiService.saveKategoriPenilaianKualitas(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 ServiceVOException {} when add Kategori Penilaian Kualitas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add Kategori Penilaian Kualitas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/delete-jadwal-dinas-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-jadwal-dinas-pegawai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> deleteJadwalDinasPegawai(@Valid @RequestBody PegawaiJadwalKerjaVO vo, HttpServletRequest request) { try { Map result = new HashMap<>(); pegawaiJadwalKerjaService.deletePegawaiJadwalKerja(vo.getId()); - 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 ServiceVOException {} when delete jadwal dinas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete jadwal dinas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-jumlah-pengajuan-ketidakhadiran-diproses", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jumlah-pengajuan-ketidakhadiran-diproses", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJumlahCutiTahunanDiproses(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idPlan") Integer idPlan) { Map result = new HashMap<>(); @@ -5246,15 +4900,14 @@ public class SdmController extends LocaleController { .countJumlahPengajuanTahunDepanDiprosesByPegawai(idPegawai, idPlan); result.put("jumlahPengajuanTahunDepanDiproses", jumlahCutiTahunDepanDiproses); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-jumlah-pengajuan-ketidakhadiran-diproses-edit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jumlah-pengajuan-ketidakhadiran-diproses-edit", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJumlahCutiTahunanDiproses(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idPlan") Integer idPlan, @RequestParam(value = "noPlanning") String noPlanning) { @@ -5268,142 +4921,134 @@ public class SdmController extends LocaleController { .countJumlahPengajuanTahunDepanDiprosesByPegawai(idPegawai, idPlan, noPlanning); result.put("jumlahPengajuanTahunDepanDiproses", jumlahCutiTahunDepanDiproses); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - @RequestMapping(value = "/get-data-riwayat-pendidikan-pgw", method = RequestMethod.GET) + @RequestMapping(value = "/get-data-riwayat-pendidikan-pgw", method = GET) public ResponseEntity> getRiwayatPendidikanByPegawai( @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { try { Map result = new HashMap<>(); result.put("data", riwayatPendidikanService.findSimpleRiwayatPendidikanByPegawai(id)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get all dokter", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get all dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-str-expired-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-str-expired-pegawai", method = GET) public ResponseEntity> getPegawaiStrExpiredByPegawai(HttpServletRequest request) { try { Map pegawais = rekamDataPegawaiService.getpegawaiStrExpiredByPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getAllPegawaiAktifByRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getAllPegawaiAktifByRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-sip-str-expired-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-sip-str-expired-pegawai", method = GET) public ResponseEntity> getPegawaiSipExpiredByPegawai(HttpServletRequest request) { try { Map pegawais = rekamDataPegawaiService.getpegawaiSipStrExpiredByPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get data sip str login user", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get data sip str login user", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kewenangan-klinis-expired-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-kewenangan-klinis-expired-pegawai", method = GET) public ResponseEntity> getPegawaiKewenanganKlinisExpiredByPegawai(HttpServletRequest request) { try { Map pegawais = rekamDataPegawaiService.getpegawaiSipStrKewenanganKlinisExpiredByPegawai(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(pegawais, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(pegawais, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get data kewenangan klinis login user", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get data kewenangan klinis login user", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-ruangan", method = RequestMethod.GET) + @RequestMapping(value = "/get-daftar-ruangan", method = GET) public ResponseEntity>> getListRuanganDepartemen(HttpServletRequest request, @RequestParam(value = "departemenId") Integer departemenId) { try { List> result = ruanganService.findListRuanganDepartemen(departemenId); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get data list ruangan departemen", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get data list ruangan departemen", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-jadwal-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-jadwal-pegawai", method = GET) public ResponseEntity> getJadwalPegawai(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = absensiPegawaiService.findJadwalPegawai(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get jadwal pegawai login", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get jadwal pegawai login", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-histori-presensi-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-histori-presensi-pegawai", method = GET) public ResponseEntity>> getHistoriPresensiPegawai(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai) { try { List> result = absensiPegawaiService.findHistoriPresensi(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get histori presensi pegawai login", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get histori presensi pegawai login", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -5417,7 +5062,7 @@ public class SdmController extends LocaleController { return request.getRemoteAddr(); } - @RequestMapping(value = "/save-presensi-pegawai/", method = RequestMethod.POST) + @RequestMapping(value = "/save-presensi-pegawai/", method = POST) public ResponseEntity> savePresensiPegawai(@RequestBody HabsenVO vo, HttpServletRequest request) { try { @@ -5425,65 +5070,63 @@ public class SdmController extends LocaleController { Map result = absensiPegawaiService.saveHabsensiPegawai(vo); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { logAccService.putToLog(vo); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (JpaSystemException jse) { logAccService.putToLog(vo); LOGGER.error("Got JpaSystemException {} when save presensi pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } catch (Exception ex) { logAccService.putToLog(vo); LOGGER.error("Got Exception {} when save presensi pegawai", ex.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ex.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, ex.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/log-presensi-pegawai/", method = RequestMethod.POST) + @RequestMapping(value = "/log-presensi-pegawai/", method = POST) public ResponseEntity putLogPresensiPegawai(@RequestBody HabsenVO vo, HttpServletRequest request) { try { logAccService.putToLog(vo); - return RestUtil.getJsonResponse(true, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(true, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when put log presensi pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when put log presensi pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-rincian-kegiatan-pegawai", method = RequestMethod.GET) + @RequestMapping(value = "/get-rincian-kegiatan-pegawai", method = GET) public ResponseEntity> getListRincianKegiatan(HttpServletRequest request, @RequestParam(value = "idJabatan") Integer idJabatan, @RequestParam(value = "idPelaksanaanTugas") Integer idPelaksanaanTugas) { try { Map result = uraianTugasService.getRincianKegiatanPegawai(idJabatan, idPelaksanaanTugas); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get data list rincian kegiatan pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get data list rincian kegiatan pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/generate-excel", method = RequestMethod.GET) + @RequestMapping(value = "/generate-excel", method = GET) public void generateExcel(@RequestParam(value = "bulan") String bulan, @RequestParam(value = "idUnitKerja") Integer idUnitKerja, @RequestParam(value = "idSubunitKerja") Integer idSubunitKerja, HttpServletRequest request, @@ -5500,7 +5143,7 @@ public class SdmController extends LocaleController { } } - @RequestMapping(value = "/download-jadwal", method = RequestMethod.GET) + @RequestMapping(value = "/download-jadwal", method = GET) public ResponseEntity downloadJadwal(@RequestParam(value = "filename") String fileName, HttpServletRequest request) { Resource resource; @@ -5508,18 +5151,18 @@ public class SdmController extends LocaleController { try { resource = pegawaiJadwalKerjaService.loadFileAsResource(fileName); } catch (Exception e) { - LOGGER.error("Got Exception {} when download jadwal", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got Exception {} when loadFileAsResource", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } String contentType; try { contentType = request.getServletContext().getMimeType(resource.getFile().getAbsolutePath()); } catch (Exception e) { - LOGGER.error("Got Exception {} when download jadwal", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got Exception {} when getMimeType", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } if (CommonUtil.isNullOrEmpty(contentType)) { @@ -5530,54 +5173,52 @@ public class SdmController extends LocaleController { .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + resource.getFilename()) .body(resource); } else { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/get-activity-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-activity-pegawai", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getActivityPegawai(HttpServletRequest request, @RequestParam(value = "tanggal", required = false) String tanggal, @RequestParam(value = "idPegawai", required = false) Integer idPegawai) { try { List> result = activityPegawaiService.getActivityData(tanggal, idPegawai); 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 ServiceVOException {} when get activity pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get activity pegawai", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-rekap-status-wfh", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekap-status-wfh", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getRekapStatusWFH(HttpServletRequest request, @RequestParam(value = "bulan", required = false) String bulan) { try { List> result = monitoringAbsenService.getRekapStatusWFH(bulan); 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 ServiceVOException {} when get rekapitulasi status wfh", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get rekapitulasi status wfh", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-habsen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-habsen", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataHabsen(HttpServletRequest request, @RequestParam(value = "tglAwal", required = false) String tglAwal, @RequestParam(value = "tglAkhir", required = false) String tglAkhir, @@ -5585,198 +5226,188 @@ public class SdmController extends LocaleController { try { List> result = monitoringAbsenService.getDataHabsen(tglAwal, tglAkhir, idPegawai); 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 ServiceVOException {} when get data habsen", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get data habsen", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kuantitas-capaian-hari-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kuantitas-capaian-hari-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKuantitasCapaianHariKerja(HttpServletRequest request, @RequestParam(value = "idPegawai", required = false) Integer idPegawai, @RequestParam(value = "bulan", required = false) String bulan) { try { Map result = remunerasiService.getKuantitasCapaianHariKerja(idPegawai, bulan); 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 ServiceVOException {} when get kuantitas capaian hari kerja", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get kuantitas capaian hari kerja", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pegawai-atasan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pegawai-atasan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaiAtasan(HttpServletRequest request, @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "idJabatan", required = false) Integer idJabatan) { try { List> result = mappingPegawaiToAtasanService.getPegawaiAtasanByJabatan(id, idJabatan); 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 ServiceVOException {} when get pegawai atasan by jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get pegawai atasan by jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-evaluasi-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllEvaluasiJabatan(HttpServletRequest request) { try { List> result = evaluasiJabatanService.findActiveEvaluasiJabatan(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get all evaluasi jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get all evaluasi jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-histori-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-histori-evaluasi-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getHistoriEvaluasiJabatan(HttpServletRequest request) { try { List> result = evaluasiJabatanService.findAllEvaluasiJabatan(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get histori evaluasi jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get histori evaluasi jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-anggaran-remunerasi-tahun-ini", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-anggaran-remunerasi-tahun-ini", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAnggaranRemunerasiTahunIni(HttpServletRequest request) { try { Map result = anggaranRemunerasiService.findAnggaranTahunIni(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get anggaran remunerasi tahun ini", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get anggaran remunerasi tahun ini", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-remunerasi-operasional-tahun-ini", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-remunerasi-operasional-tahun-ini", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRemunerasiOperasionalTahunIni(HttpServletRequest request) { try { Map result = remunerasiOperasionalService.findAnggaranTahunIni(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get remunerasi operasional tahun ini", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get remunerasi operasional tahun ini", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-plafon-remunerasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-plafon-remunerasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPlafonRemunerasi(HttpServletRequest request) { try { List> result = nilaiKelompokJabatanService.getPlafonRemunerasi(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get plafon kmk remunerasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get plafon kmk remunerasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-penempatan-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-penempatan-evaluasi-jabatan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPenempatanEvaluasiJabatan(HttpServletRequest request) { try { List> result = nilaiKelompokJabatanService.getPenempatanEvaluasiJabatan(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get penempatan evaluasi jabatan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get penempatan evaluasi jabatan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/daftar-dokter", method = RequestMethod.GET) + @RequestMapping(value = "/daftar-dokter", method = GET) public ResponseEntity>> getDaftarDokter(HttpServletRequest request, @RequestParam(value = "ksmId", required = false) Integer idKsm, @RequestParam(value = "kkId", required = false) Integer idKk, @RequestParam(value = "drId", required = false) Integer idDr) { try { List> result = cpptService.findDokter(idKsm, idKk, idDr); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when get daftar dokter", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get daftar dokter", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-map-jabatan-profesi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-map-jabatan-profesi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity saveMapJabatanProfesi(HttpServletRequest request, @Valid @RequestBody MapJabatanProfesiVO vo) { try { @@ -5788,118 +5419,112 @@ public class SdmController extends LocaleController { } if (CommonUtil.isNotNullOrEmpty(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); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.MESSAGE, "Mapping jabatan sudah tersedia"); - return RestUtil.getJsonResponse(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonResponse(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when add/update mapping jabatan ke profesi", sve.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add/update mapping jabatan ke profesi", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/delete-map-jabatan-profesi", method = RequestMethod.POST) + @RequestMapping(value = "/delete-map-jabatan-profesi", method = POST) public ResponseEntity deleteMapJabatanProfesi(HttpServletRequest request, @RequestParam(value = "id") Integer id) { try { Boolean result = mapJabatanProfesiService.delete(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException sve) { LOGGER.error("Got ServiceVOException {} when delete mapping jabatan ke profesi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, sve.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete mapping jabatan ke profesi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-mapping-jabatan-profesi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-mapping-jabatan-profesi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllMappingProfesiJabatan(HttpServletRequest request) { try { List> result = mapJabatanProfesiService.findMapping(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get all mapping jabatan profesi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get all mapping jabatan profesi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-profesi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-profesi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDaftarProfesi(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jenisId", required = false) Short idJenis) { try { List> result = profesiService.findByStatus(idPegawai, idJenis); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get daftar profesi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get daftar profesi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-akses-logbook-skor", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-akses-logbook-skor", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAksesLogbookSkor(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai) { try { Map result = jabatanService.findAksesLogbookSkoring(idPegawai); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get kelompok jabatan logbook skor", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get kelompok jabatan logbook skor", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-kelompok-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-kelompok-kerja", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDaftarKelompokKerja(HttpServletRequest request) { try { List> result = unitKerjaPegawaiService.findAllKelompokKerja(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when get daftar kelompok kerja staf medik", e.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when get daftar kelompok kerja staf medik", jse.getMessage()); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java index 9a26121f..2a3e265f 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java @@ -1,16 +1,12 @@ package com.jasamedika.medifirst2000.controller; -import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.dto.KomponenGajiDto; import com.jasamedika.medifirst2000.dto.SlipGajiDto; import com.jasamedika.medifirst2000.service.SlipGajiService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.ResourceUtils; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -22,59 +18,68 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.util.ResourceUtils.loadFile; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +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("/slip-gaji") public class SlipGajiController { + @Autowired private SlipGajiService slipGajiService; - @RequestMapping(value = "/init", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/init", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity init() { try { slipGajiService.init(); - return new ResponseEntity<>(true, HttpStatus.CREATED); + return new ResponseEntity<>(true, CREATED); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>(e.getMessage(), INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity save(@RequestBody @Valid SlipGajiDto dto) { try { slipGajiService.save(dto); - return new ResponseEntity<>(true, HttpStatus.CREATED); + return new ResponseEntity<>(true, CREATED); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>(e.getMessage(), INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/unggah", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/unggah", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity save(@RequestBody List dtoList) { try { slipGajiService.save(dtoList); - return new ResponseEntity<>(true, HttpStatus.CREATED); + return new ResponseEntity<>(true, CREATED); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>(e.getMessage(), INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/detail/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/detail/update", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity updateDetail(@RequestBody @Valid SlipGajiDto dto) { try { slipGajiService.updateDetail(dto); - return new ResponseEntity<>(true, HttpStatus.CREATED); + return new ResponseEntity<>(true, CREATED); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>(e.getMessage(), INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/get/{pegawaiId}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get/{pegawaiId}/{bulan}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity get(@PathVariable Integer pegawaiId, @PathVariable Long bulan) { SlipGajiDto entity = slipGajiService.get(pegawaiId, bulan); - return new ResponseEntity<>(entity, HttpStatus.OK); + return new ResponseEntity<>(entity, OK); } - @RequestMapping(value = "/template/generate/{bulan}", method = RequestMethod.GET) + @RequestMapping(value = "/template/generate/{bulan}", method = GET) public ResponseEntity generateTemplate(@PathVariable Long bulan, HttpServletRequest request, HttpServletResponse response) { try { @@ -83,30 +88,30 @@ public class SlipGajiController { response.setHeader("Content-Disposition", "attachment; filename=" + fileNamePath); Map result = new HashMap<>(); result.put("filename", fileNamePath); - return new ResponseEntity<>(result, HttpStatus.OK); + return new ResponseEntity<>(result, OK); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>(e.getMessage(), INTERNAL_SERVER_ERROR); } } - @RequestMapping(value = "/template/download", method = RequestMethod.GET) + @RequestMapping(value = "/template/download", method = GET) public ResponseEntity downloadTemplate(@RequestParam(value = "filename") String fileName, HttpServletRequest request) { Resource resource; Map mapHeaderMessage = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(fileName)) { try { - resource = ResourceUtils.loadFile(fileName); + resource = loadFile(fileName); } catch (Exception e) { - mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } String contentType; try { contentType = request.getServletContext().getMimeType(resource.getFile().getAbsolutePath()); } catch (Exception e) { - mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + mapHeaderMessage.put(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } if (CommonUtil.isNullOrEmpty(contentType)) contentType = "application/octet-stream"; @@ -114,13 +119,13 @@ public class SlipGajiController { .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + resource.getFilename()) .body(resource); } else { - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } } - @RequestMapping(value = "/komponen/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/komponen/list", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity get() { List entity = slipGajiService.listKomponen(); - return new ResponseEntity<>(entity, HttpStatus.OK); + return new ResponseEntity<>(entity, OK); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/IBaseRestController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/IBaseRestController.java deleted file mode 100644 index 4a59c5b4..00000000 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/IBaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.List; - -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.ResponseBody; - -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface IBaseRestController extends - IRestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") Integer id); - - @RequestMapping(value = "/", method = RequestMethod.PUT, consumes = { "application/json" }) - @ResponseBody - public ResponseEntity addVO(@RequestBody V vo); - - @RequestMapping(value = "/", method = RequestMethod.POST, consumes = { "application/json" }) - @ResponseBody - public ResponseEntity editVO(@RequestBody V vo); - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseBody - public ResponseEntity deleteVO(@PathVariable("id") Integer id); - - @RequestMapping(value = "/", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity> getAllVO(); - -} diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/IRestPageController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/IRestPageController.java deleted file mode 100644 index f9f7f890..00000000 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/IRestPageController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface IRestPageController { - /** - * - * @param page - * : page of - * @param limit - * : limit query - * @param sort - * : sort by - * @param dir - * : direction {asc:desc} - * @return Collection of VO, Total-Count & Total Pages on response header - */ - @RequestMapping(value = "/list", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity> getAllVOWithQueryString( - HttpServletRequest request, - @RequestParam(value = "page", required = false) Integer page, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir); -} diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java index 943235fa..710ee441 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java @@ -1,54 +1,47 @@ package com.jasamedika.medifirst2000.controller.base; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Type; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializer; +import com.jasamedika.medifirst2000.base.vo.BaseModelVO; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.entities.Pegawai; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ActivityPegawaiService; +import com.jasamedika.medifirst2000.service.LoginUserService; +import com.jasamedika.medifirst2000.service.ModelService; +import com.jasamedika.medifirst2000.vo.ModelVO; +import com.jasamedika.medifirst2000.vo.PegawaiVO; +import io.socket.client.IO; +import io.socket.client.Socket; import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.service.ActivityPegawaiService; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.ModelService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ModelVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URISyntaxException; +import java.util.*; -import io.socket.client.IO; +import static com.jasamedika.medifirst2000.constants.Constants.Locale.INA; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER; +import static com.jasamedika.medifirst2000.core.web.WebConstants.PageParameter.*; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static io.socket.client.Socket.EVENT_CONNECT; +import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; /** * Base Controller Class for handling messaga resource for internationalization @@ -58,7 +51,7 @@ import io.socket.client.IO; */ public abstract class LocaleController { - /* + /** * messageSource bean injected for each controller for accessing message * source */ @@ -74,82 +67,66 @@ public abstract class LocaleController { @Autowired private MessageSource messageSource; - @SuppressWarnings("rawtypes") @Autowired - private ModelService modelService; + private ModelService modelService; - protected Map mapHeaderMessage = new HashMap(); + protected Map mapHeaderMessage = new HashMap<>(); - /* + /** * code locale */ protected String getMessage(String code, HttpServletRequest request) { return messageSource.getMessage(code, null, new Locale(getCoociesLanguage(request))); } - protected void SaveLog(String keterangan, String group, HttpServletRequest request) { + protected void saveLog(String keterangan, String group) { activityPegawaiServiceImpl.record( pegawaiConverter.transferModelToVO(loginUserService.getLoginUser().getPegawai(), new PegawaiVO()), new Date(), keterangan, group); } protected Object getItem(HttpServletRequest request, Object vo) { - BufferedReader reader; - String read = null; - String resultData = ""; - Gson gson = new Gson(); try { - reader = new BufferedReader(new InputStreamReader(request.getInputStream())); - + StringBuilder resultData = new StringBuilder(); + BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream())); + String read; while ((read = reader.readLine()) != null) { - resultData += read; - System.out.println(read); + resultData.append(read); } - - gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create(); + Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create(); + return gson.fromJson(resultData.toString(), vo.getClass()); } catch (IOException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return vo = gson.fromJson(resultData, vo.getClass()); } protected Object getItem2(HttpServletRequest request, Object vo) { - BufferedReader reader; - String read = null; - String resultData = ""; - Gson gson = new Gson(); - try { - reader = new BufferedReader(new InputStreamReader(request.getInputStream())); + try { + StringBuilder resultData = new StringBuilder(); + BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream())); + String read; while ((read = reader.readLine()) != null) { - resultData += read; - System.out.println(read); + resultData.append(read); } GsonBuilder gsonBuilder = new GsonBuilder(); - gsonBuilder.registerTypeAdapter(Date.class, new JsonDeserializer() { - @Override - public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { - if (json.getAsString() instanceof String) { - return new Date(); - } else { - return new Date(json.getAsJsonPrimitive().getAsLong()); - } - } + gsonBuilder.registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> { + if (json.getAsString() != null) + return new Date(); + return new Date(json.getAsJsonPrimitive().getAsLong()); }); - gson = gsonBuilder.create(); + Gson gson = gsonBuilder.create(); + return gson.fromJson(resultData.toString(), vo.getClass()); } catch (IOException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return vo = gson.fromJson(resultData, vo.getClass()); } - @RequestMapping(value = "/lang/{lang}", method = RequestMethod.GET) + @RequestMapping(value = "/lang/{lang}", method = GET) public boolean preHandle(HttpServletRequest request, HttpServletResponse response, - @PathVariable("lang") String lang) throws Exception { - + @PathVariable("lang") String lang) { Cookie[] cookies = request.getCookies(); - List cookieList = new ArrayList(); + List cookieList; if (cookies != null) { cookieList = Arrays.asList(cookies); for (Cookie cookie : cookieList) { @@ -161,7 +138,6 @@ public abstract class LocaleController { } } } - if (lang.equalsIgnoreCase("en")) { Cookie c = new Cookie("lang", "en"); c.setPath("/"); @@ -178,63 +154,53 @@ public abstract class LocaleController { c.setDomain("localhost"); response.addCookie(c); } - return true; } - /* + /** * default locale ID */ protected String getMessage(String code) { - return messageSource.getMessage(code, null, new Locale(Constants.Locale.INA)); + return messageSource.getMessage(code, null, new Locale(INA)); } protected void addHeaderMessage(String key, String message) { this.mapHeaderMessage.put(key, message); } - @RequestMapping(value = "/entity-serelize/{entity}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/entity-serelize/{entity}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity serializeEntity(@PathVariable("entity") String entity, HttpServletRequest request) { ModelVO modelDTO = modelService.getModelSerializeEntity(entity, getCoociesLanguage(request)); - return RestUtil.getJsonResponse(modelDTO, HttpStatus.OK); + return getJsonResponse(modelDTO, OK); } public String getCoociesLanguage(HttpServletRequest request) { - Cookie cookie[] = request.getCookies(); + Cookie[] cookie = request.getCookies(); Cookie cook; - String lang = Constants.Locale.INA; + String lang = INA; if (cookie != null) { - for (int i = 0; i < cookie.length; i++) { - cook = cookie[i]; + for (Cookie value : cookie) { + cook = value; if (cook.getName().equalsIgnoreCase("lang")) lang = cook.getValue(); } } - return lang; - } - @SuppressWarnings("rawtypes") - protected ResponseEntity constructListPageResult(Map map) { - + protected ResponseEntity> constructListPageResult(Map map) { if (map == null) { - Map mapHeaderMessage = new HashMap(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, "0"); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, "0"); - mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Data not found."); - return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, mapHeaderMessage); + 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))); - - 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))); + return getJsonResponse(vos, OK, mapHeaderMessage); } } @@ -243,86 +209,65 @@ public abstract class LocaleController { } protected void BroadcastMessage(final String to, final Object data) { - final io.socket.client.Socket socket; + final Socket socket; try { String url = GetSettingDataFixed("UrlSocketMessaging"); socket = IO.socket(url); - - socket.on(io.socket.client.Socket.EVENT_CONNECT, new io.socket.emitter.Emitter.Listener() { - - @Override - public void call(Object... args) { - - try { - Gson gson = new Gson(); - String json = gson.toJson(data); - JSONObject item = new JSONObject( - "{\"to\":\"" + to + "\",\"message\":\"" + json.replace("\"", "'") + "\"}"); - socket.emit("subscribe", item); - } catch (JSONException e) { - e.printStackTrace(); - } + socket.on(EVENT_CONNECT, args -> { + try { + Gson gson = new Gson(); + String json = gson.toJson(data); + JSONObject item = new JSONObject( + "{\"to\":\"" + to + "\",\"message\":\"" + json.replace("\"", "'") + "\"}"); + socket.emit("subscribe", item); + } catch (JSONException e) { + throw new ServiceVOException(e.getMessage()); } - }); socket.connect(); } catch (URISyntaxException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } protected void BroadcastMessage(final String to, final String data) { - final io.socket.client.Socket socket; + final Socket socket; try { socket = IO.socket(GetSettingDataFixed("UrlSocketMessaging")); - - socket.on(io.socket.client.Socket.EVENT_CONNECT, new io.socket.emitter.Emitter.Listener() { - - @Override - public void call(Object... args) { - - try { - JSONObject item = new JSONObject("{\"to\":\"" + to + "\",\"message\":\"" + data + "\"}"); - socket.emit("subscribe", item); - } catch (JSONException e) { - e.printStackTrace(); - } + socket.on(EVENT_CONNECT, args -> { + try { + JSONObject item = new JSONObject("{\"to\":\"" + to + "\",\"message\":\"" + data + "\"}"); + socket.emit("subscribe", item); + } catch (JSONException e) { + throw new ServiceVOException(e.getMessage()); } - }); socket.connect(); } catch (URISyntaxException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } protected void BroadcastMessageOther(final String to, final Object data) { - final io.socket.client.Socket socket; + final Socket socket; try { String url = GetSettingDataFixed("UrlSocketMessaging"); socket = IO.socket(url); - - socket.on(io.socket.client.Socket.EVENT_CONNECT, new io.socket.emitter.Emitter.Listener() { - - @Override - public void call(Object... args) { - try { - Map result = new HashMap<>(); - result.put("message", data); - result.put("to", to); - - Gson gson = new Gson(); - JSONObject item = new JSONObject(gson.toJson(result)); - socket.emit("subscribe", item); - } catch (JSONException e) { - e.printStackTrace(); - } + socket.on(EVENT_CONNECT, args -> { + try { + Map result = new HashMap<>(); + result.put("message", data); + result.put("to", to); + Gson gson = new Gson(); + JSONObject item = new JSONObject(gson.toJson(result)); + socket.emit("subscribe", item); + } catch (JSONException e) { + throw new ServiceVOException(e.getMessage()); } }); socket.connect(); } catch (URISyntaxException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java index 30a686df..4ac37a54 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/ParamRestController.java @@ -1,78 +1,68 @@ package com.jasamedika.medifirst2000.controller.base; -import java.util.List; - -import org.springframework.core.GenericTypeResolver; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; - import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.monitorjbl.json.JsonResult; import com.monitorjbl.json.JsonView; import com.monitorjbl.json.Match; +import org.springframework.core.GenericTypeResolver; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +import static com.jasamedika.medifirst2000.constants.Constants.COMMA; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.web.bind.annotation.RequestMethod.GET; /** - * Base Controller Class for handling "include" parameter to controller - * @see https://github.com/monitorjbl/json-view + * Base Controller Class for handling "include" parameter to controller * + * @see json view + * * @author Roberto */ public abstract class ParamRestController { - private JsonResult jsonResult = JsonResult.instance(); - /* - * Belum selesai, baru di parameter includes. Untuk field object juga belom. - * example : - * http://localhost:8080/jasamedika-web/{typeVOClass}/list-using-param - * ?includes =id,nama - */ - @RequestMapping(value = "/list-using-param", method = RequestMethod.GET) - public ResponseEntity> listUsingParam( - @RequestParam(value = "includes", required = false) String includes, + private final JsonResult jsonResult = JsonResult.instance(); + + @RequestMapping(value = "/list-using-param", method = GET) + public ResponseEntity> listUsingParam(@RequestParam(value = "includes", required = false) String includes, @RequestParam(value = "excludes", required = false) String excludes) { List listVO = getAllVOFromService(); String[] arrExcludes = null; String[] arrIncludes = null; if (excludes != null) - arrExcludes = excludes.split(Constants.COMMA); + arrExcludes = excludes.split(COMMA); if (includes != null) - arrIncludes = includes.split(Constants.COMMA); + arrIncludes = includes.split(COMMA); if (arrExcludes != null && arrIncludes != null) { listVO = jsonResult.use( - JsonView.with(listVO).onClass( - getClazz(), - Match.match().exclude(arrExcludes) - .include(arrIncludes))).returnValue(); + JsonView.with(listVO).onClass(getClazz(), Match.match().exclude(arrExcludes).include(arrIncludes))) + .returnValue(); } if (arrExcludes != null && arrIncludes == null) { - listVO = jsonResult.use( - JsonView.with(listVO).onClass(getClazz(), - Match.match().include("*").exclude(arrExcludes))) + listVO = jsonResult + .use(JsonView.with(listVO).onClass(getClazz(), Match.match().include("*").exclude(arrExcludes))) .returnValue(); } if (arrExcludes == null && arrIncludes != null) { - listVO = jsonResult.use( - JsonView.with(listVO).onClass(getClazz(), - Match.match().exclude("*").include(arrIncludes))) + listVO = jsonResult + .use(JsonView.with(listVO).onClass(getClazz(), Match.match().exclude("*").include(arrIncludes))) .returnValue(); } - return RestUtil.getJsonResponse(listVO, HttpStatus.OK); + return getJsonResponse(listVO, OK); } - @SuppressWarnings("unchecked") - protected Class getClazz() { - return (Class) GenericTypeResolver.resolveTypeArgument(getClass(), - ParamRestController.class); + protected Class getClazz() { + return GenericTypeResolver.resolveTypeArgument(getClass(), ParamRestController.class); } - /* + /** * method untuk mendapatkan all VO from service - * */ + * + */ protected abstract List getAllVOFromService(); } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java index dc983afb..7d07db34 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/CORSFilter.java @@ -1,164 +1,42 @@ package com.jasamedika.medifirst2000.filter; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Iterator; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; - import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import com.jasamedika.medifirst2000.constants.Constants; +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.Iterator; + +import static com.jasamedika.medifirst2000.constants.Constants.HttpHeader.KD_RUANGAN_A; +import static com.jasamedika.medifirst2000.constants.Constants.HttpHeader.KD_RUANGAN_T; /** * CORSFilter class * - * @author Roberto + * @author Roberto, Syamsu */ @Component public class CORSFilter implements Filter { - - // Start Syamsu - private static class RequestWrapper extends HttpServletRequestWrapper { - final String body; - - public RequestWrapper(ServletRequest req) throws IOException { - super((HttpServletRequest) req); - - HttpServletRequest request = (HttpServletRequest) req; - - StringBuilder stringBuilder = new StringBuilder(); - BufferedReader reader = null; - try { - InputStream inputStream = request.getInputStream(); - if (inputStream != null) { - reader = new BufferedReader(new InputStreamReader(inputStream)); - String hasil; - while ( (hasil = reader.readLine()) != null) { - stringBuilder.append(hasil); - } - } else { - stringBuilder.append(""); - } - } catch (IOException ex) { - throw ex; - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException ex) { - throw ex; - } - } - } - body = stringBuilder.toString(); - - String idRuanganTujuan = request.getHeader(Constants.HttpHeader.KD_RUANGAN_T) == null ? "" - : request.getHeader(Constants.HttpHeader.KD_RUANGAN_T); - - if ("".equals(idRuanganTujuan.trim())){ - try{ - JSONObject jObject = new JSONObject(body); - ExtractObjectJson(jObject, false); - }catch(Exception e){ - - } - } - } - - public String getHeader(String key){ - if (key.equals(Constants.HttpHeader.KD_RUANGAN_A)) { - if (autoIdTujuan.length() > 0){ - return autoIdTujuan.toString(); - } - } - - return super.getHeader(key); - } - - JSONArray autoIdTujuan = new JSONArray(); - - void ExtractObjectJson(JSONObject jObject, boolean ruangan) throws Exception{ - Iterator iterator = jObject.keys(); - while (iterator.hasNext()){ - String key = String.valueOf(iterator.next()); - Object o = jObject.get(key); - - if (key.toLowerCase().contains("ruangan")){ - if (o instanceof Integer){ - autoIdTujuan.put(o); - } else if (o instanceof JSONObject){ - ExtractObjectJson((JSONObject) o, true); - } - } else if (ruangan && "id".equals(key)){ - if (o instanceof Integer){ - autoIdTujuan.put(o); - return; - } - } else if (o instanceof JSONObject && !ruangan) { - ExtractObjectJson((JSONObject) o, false); - } - } - } - - @Override - public ServletInputStream getInputStream() throws IOException { - final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes()); - ServletInputStream servletInputStream = new ServletInputStream() { - public int read() throws IOException { - return byteArrayInputStream.read(); - } - }; - return servletInputStream; - } - - @Override - public BufferedReader getReader() throws IOException { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - public String getBody() { - return this.body; - } - } - // End Syamsu - - - private final Logger log = LoggerFactory.getLogger(CORSFilter.class); public CORSFilter() { - log.info("CORSFilter JasaMedika Web init"); + LOGGER.info("CORSFilter JasaMedika Web init"); } + private static final Logger LOGGER = LoggerFactory.getLogger(CORSFilter.class); + @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { - - // Start Syamsu - RequestWrapper myReq = new RequestWrapper((HttpServletRequest) req); - // End Syamsu - HttpServletRequest request = (HttpServletRequest) myReq; + RequestWrapper myReq = new RequestWrapper(req); HttpServletResponse response = (HttpServletResponse) res; - - response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin")); + response.setHeader("Access-Control-Allow-Origin", myReq.getHeader("Origin")); response.setHeader("Access-Control-Allow-Credentials", "true"); - response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); response.setHeader("Access-Control-Max-Age", "3600"); response.setHeader("Access-Control-Allow-Headers", @@ -166,23 +44,101 @@ public class CORSFilter implements Filter { + "Supervising, RequestSupervisor, Module, Form, Action, AlamatUrlForm, KdRuangan, KdUser, " + "MandatoriData, idRuanganTujuan, ruanganTujuan"); response.setHeader("Content-Type", "application/json;application/octet-stream"); - - -// String body = myReq.getBody(); -// if (!"".equals(body.trim())){ -// log.info("\n\n" + myReq.getBody() + "\n"); -// } - chain.doFilter(myReq, res); } @Override public void init(FilterConfig filterConfig) { - } @Override public void destroy() { } + private static class RequestWrapper extends HttpServletRequestWrapper { + + final String body; + + JSONArray autoIdTujuan = new JSONArray(); + + public RequestWrapper(ServletRequest req) throws IOException { + super((HttpServletRequest) req); + HttpServletRequest request = (HttpServletRequest) req; + StringBuilder stringBuilder = getStringBuilder(request); + body = stringBuilder.toString(); + String idRuanganTujuan = request.getHeader(KD_RUANGAN_T) == null ? "" : request.getHeader(KD_RUANGAN_T); + if (idRuanganTujuan.trim().isEmpty()) { + try { + JSONObject jObject = new JSONObject(body); + ExtractObjectJson(jObject, false); + } catch (Exception e) { + LOGGER.error(e.getMessage()); + } + } + } + + public String getHeader(String key) { + if (key.equals(KD_RUANGAN_A) && autoIdTujuan.length() > 0) + return autoIdTujuan.toString(); + return super.getHeader(key); + } + + void ExtractObjectJson(JSONObject jObject, boolean ruangan) throws Exception { + Iterator iterator = jObject.keys(); + while (iterator.hasNext()) { + String key = String.valueOf(iterator.next()); + Object o = jObject.get(key); + if (key.toLowerCase().contains("ruangan")) { + if (o instanceof Integer) { + autoIdTujuan.put(o); + } else if (o instanceof JSONObject) { + ExtractObjectJson((JSONObject) o, true); + } + } else if (ruangan && "id".equals(key)) { + if (o instanceof Integer) { + autoIdTujuan.put(o); + return; + } + } else if (o instanceof JSONObject && !ruangan) { + ExtractObjectJson((JSONObject) o, false); + } + } + } + + @Override + public ServletInputStream getInputStream() { + final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes()); + return new ServletInputStream() { + public int read() { + return byteArrayInputStream.read(); + } + }; + } + + @Override + public BufferedReader getReader() { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + } + + private static StringBuilder getStringBuilder(HttpServletRequest request) throws IOException { + StringBuilder stringBuilder = new StringBuilder(); + BufferedReader reader = null; + try { + InputStream inputStream = request.getInputStream(); + if (inputStream != null) { + reader = new BufferedReader(new InputStreamReader(inputStream)); + String hasil; + while ((hasil = reader.readLine()) != null) { + stringBuilder.append(hasil); + } + } + } finally { + if (reader != null) { + reader.close(); + } + } + return stringBuilder; + } + } \ No newline at end of file diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java index cc1c7452..7c2ff6f0 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/filter/StatelessAuthenticationFilter.java @@ -1,8 +1,12 @@ package com.jasamedika.medifirst2000.filter; +import com.fasterxml.jackson.core.JsonParseException; +import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; import io.jsonwebtoken.MalformedJwtException; - -import java.io.IOException; +import lombok.AllArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.GenericFilterBean; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -10,54 +14,39 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.filter.GenericFilterBean; - -import com.fasterxml.jackson.core.JsonParseException; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; /** * StatelessAuthenticationFilter class * * @author Roberto */ +@AllArgsConstructor public class StatelessAuthenticationFilter extends GenericFilterBean { + private final TokenAuthenticationService authenticationService; - public StatelessAuthenticationFilter( - TokenAuthenticationService authenticationService) { - this.authenticationService = authenticationService; - } - - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain filterChain) throws IOException, ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) + throws IOException, ServletException { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletRequest req = (HttpServletRequest) request; HttpServletResponse res = (HttpServletResponse) response; - - res.setHeader("Access-Control-Allow-Origin", - req.getHeader("Origin")); + res.setHeader("Access-Control-Allow-Origin", req.getHeader("Origin")); res.setHeader("Access-Control-Allow-Credentials", "true"); - - res.setHeader("Access-Control-Allow-Methods", - "POST, GET, OPTIONS, DELETE"); + res.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); res.setHeader("Access-Control-Max-Age", "3600"); res.setHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me, X-AUTH-TOKEN, Supervising, " - + "RequestSupervisor, Module, Form, Action, AlamatUrlForm, KdRuangan, KdUser, " - + "MandatoriData"); - + + "RequestSupervisor, Module, Form, Action, AlamatUrlForm, KdRuangan, KdUser, " + + "MandatoriData"); Authentication authentication = null; try { - authentication = authenticationService.getAuthentication(httpRequest); } catch (JsonParseException | MalformedJwtException e) { HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.addHeader(Constants.MessageInfo.ERROR_MESSAGE, - "Error Token (Not Valid Token)"); + httpResponse.addHeader(ERROR_MESSAGE, "Error Token (Not Valid Token)"); filterChain.doFilter(request, response); } SecurityContextHolder.getContext().setAuthentication(authentication); diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java index 156f2099..b7ca874b 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/handler/RestErrorHandler.java @@ -1,15 +1,12 @@ package com.jasamedika.medifirst2000.handler; -import java.util.List; -import java.util.Locale; - +import com.jasamedika.medifirst2000.base.vo.validation.ValidationErrorVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.annotation.Order; -import org.springframework.http.HttpStatus; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -18,22 +15,24 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import com.jasamedika.medifirst2000.base.vo.validation.ValidationErrorVO; -import com.jasamedika.medifirst2000.constants.Constants;; +import java.util.List; +import java.util.Locale; + +import static com.jasamedika.medifirst2000.constants.Constants.Locale.INA; +import static org.springframework.http.HttpStatus.BAD_REQUEST; /** * Exception Handler Rest Controller class * * @author Roberto */ - @ControllerAdvice -@Order(1) // Pertama masuk +@Order(1) public class RestErrorHandler { private static final Logger LOGGER = LoggerFactory.getLogger(RestErrorHandler.class); - private MessageSource messageSource; + private final MessageSource messageSource; @Autowired public RestErrorHandler(MessageSource validationNessageSource) { @@ -41,60 +40,45 @@ public class RestErrorHandler { } @ExceptionHandler(MethodArgumentNotValidException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) + @ResponseStatus(BAD_REQUEST) @ResponseBody public ValidationErrorVO processValidationError(MethodArgumentNotValidException ex) { LOGGER.warn("Handling data validation error"); BindingResult result = ex.getBindingResult(); List fieldErrors = result.getFieldErrors(); - return processFieldErrors(fieldErrors); } private ValidationErrorVO processFieldErrors(List fieldErrors) { ValidationErrorVO dto = new ValidationErrorVO(); - for (FieldError fieldError : fieldErrors) { dto.addFieldError(fieldError.getField(), fieldError.getDefaultMessage()); } - return dto; } - /* + /** * resolve error message with parameter locale */ private String resolveLocalizedErrorMessage(FieldError fieldError, String locale) { Locale currentLocale = LocaleContextHolder.getLocale(); String localizedErrorMessage = messageSource.getMessage(fieldError, currentLocale); - - // If the message was not found, return the most accurate field error - // code instead. - // You can remove this check if you prefer to get the default error - // message. if (localizedErrorMessage.equals(fieldError.getDefaultMessage())) { String[] fieldErrorCodes = fieldError.getCodes(); localizedErrorMessage = fieldErrorCodes[0]; } - return localizedErrorMessage; } - /* + /** * resolve error message with default locale */ private String resolveLocalizedErrorMessage(FieldError fieldError) { - String localizedErrorMessage = messageSource.getMessage(fieldError, new Locale(Constants.Locale.INA)); - - // If the message was not found, return the most accurate field error - // code instead. - // You can remove this check if you prefer to get the default error - // message. + String localizedErrorMessage = messageSource.getMessage(fieldError, new Locale(INA)); if (localizedErrorMessage.equals(fieldError.getDefaultMessage())) { String[] fieldErrorCodes = fieldError.getCodes(); localizedErrorMessage = fieldErrorCodes[0]; } - return localizedErrorMessage; } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index 94947677..e5e6c877 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -32,9 +32,8 @@ import java.util.List; /** * Interceptor class for All annotation method controller @AppPermission * - * @author Roberto, direka ulang oleh Syamsu + * @author Roberto, Syamsu */ - public class AppInterceptor implements HandlerInterceptor { private static final String[] PRINT_PATTERN = { "/lap_", "/lap-", "/lap", "/cetak_", "/cetak-", "/print_", diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java index 6fa5cc34..20854821 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/RestAuthenticationEntryPoint.java @@ -1,43 +1,34 @@ package com.jasamedika.medifirst2000.security; -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.jasamedika.medifirst2000.constants.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; -import com.jasamedika.medifirst2000.constants.Constants; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; /** - * RestAuthenticationEntryPoint class - * set Unauthorized response from "Unauthorized client" + * RestAuthenticationEntryPoint class set Unauthorized response from + * "Unauthorized client" * - * @author Roberto + * @author Roberto, Syamsu */ @Component("RestAuthenticationEntryPoint") public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint { - - private static final Logger LOGGER = LoggerFactory.getLogger(RestAuthenticationEntryPoint.class); - - /// Alter Syamsu + private static final Logger LOGGER = LoggerFactory.getLogger(RestAuthenticationEntryPoint.class); + @Override - public void commence(HttpServletRequest request, - HttpServletResponse response, AuthenticationException ae) - throws IOException, ServletException { - + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException ae) + throws IOException { LOGGER.error("Mencoba akses tanpa login"); + response.getWriter().write("{" + Constants.MessageInfo.ERROR_MESSAGE + ":'Please login to get access'}"); response.setHeader(Constants.MessageInfo.ERROR_MESSAGE, "Please login to get access"); response.setStatus(HttpServletResponse.SC_FORBIDDEN); - - //response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); } - } \ No newline at end of file diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java index 8553b91e..623d240f 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/SpringSecurityConfig.java @@ -1,10 +1,12 @@ package com.jasamedika.medifirst2000.security; +import com.jasamedika.medifirst2000.filter.StatelessAuthenticationFilter; +import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; +import com.jasamedika.medifirst2000.security.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -13,14 +15,11 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.filter.StatelessAuthenticationFilter; -import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; -import com.jasamedika.medifirst2000.security.service.UserService; +import static com.jasamedika.medifirst2000.constants.Constants.JASAMEDIKA; /** - * SpringSecurityConfig class - * Di sini Kita tidak menggunakan XML Config untuk Spring Security + * SpringSecurityConfig class Di sini Kita tidak menggunakan XML Config untuk + * Spring Security * * @author Roberto */ @@ -29,94 +28,35 @@ import com.jasamedika.medifirst2000.security.service.UserService; @Order(2) public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { + private final UserService userService; + + private final TokenAuthenticationService tokenAuthenticationService; + @Autowired private RestAuthenticationEntryPoint restAuthenticationEntryPoint; - - private final UserService userService; - private final TokenAuthenticationService tokenAuthenticationService; public SpringSecurityConfig() { super(true); this.userService = new UserService(); - tokenAuthenticationService = new TokenAuthenticationService( - Constants.JASAMEDIKA, userService); + tokenAuthenticationService = new TokenAuthenticationService(JASAMEDIKA, userService); } @Override protected void configure(HttpSecurity http) throws Exception { - http.exceptionHandling() - //restAuthenticationEntryPoint - .authenticationEntryPoint(restAuthenticationEntryPoint) - - .and() - .anonymous() - .and() - .servletApi() - .and() - .headers() - .cacheControl() - .and() - .authorizeRequests() - - - // Allow anonymous resource requests - .antMatchers("/favicon.ico") - .permitAll() - .antMatchers("**/*.html") - .permitAll() - .antMatchers("**/*.css") - .permitAll() - .antMatchers("**/*.js") - .permitAll() - - // Allow anonymous logins - .antMatchers("/auth/**") - .permitAll() - - // Allow SMS gateway - .antMatchers("/registrasi-pasien-sms/**") - .permitAll() - - // Allow SMS gateway - .antMatchers("/report/**") - .permitAll() - - // URL tanpa auth deklarasikan di sini - .antMatchers("/test-tanpa-auth/**") - .permitAll() - .antMatchers("/test/**") - .permitAll() - - .antMatchers("/api-docs.json") - .permitAll() - - .antMatchers("/api-docs/**") - .permitAll() - - /*//Allow Download File Surat Masuk - .antMatchers("/surat-masuk/download-dokumen-template/**") - .permitAll() - .antMatchers("/surat-masuk/get-draft-surat/**") - .permitAll()*/ - - // All other request need to be authenticated - .anyRequest() - .authenticated() - .and() - - // Custom Token based authentication based on the header - // previously given to the client - .addFilterBefore( - new StatelessAuthenticationFilter( - tokenAuthenticationService), + http.exceptionHandling().authenticationEntryPoint(restAuthenticationEntryPoint).and().anonymous().and() + .servletApi().and().headers().cacheControl().and().authorizeRequests().antMatchers("/favicon.ico") + .permitAll().antMatchers("**/*.html").permitAll().antMatchers("**/*.css").permitAll() + .antMatchers("**/*.js").permitAll().antMatchers("/auth/**").permitAll() + .antMatchers("/registrasi-pasien-sms/**").permitAll().antMatchers("/report/**").permitAll() + .antMatchers("/test-tanpa-auth/**").permitAll().antMatchers("/test/**").permitAll() + .antMatchers("/api-docs.json").permitAll().antMatchers("/api-docs/**").permitAll().anyRequest() + .authenticated().and().addFilterBefore(new StatelessAuthenticationFilter(tokenAuthenticationService), UsernamePasswordAuthenticationFilter.class); } @Override - protected void configure(AuthenticationManagerBuilder auth) - throws Exception { - auth.userDetailsService(userDetailsService()).passwordEncoder( - new BCryptPasswordEncoder()); + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userDetailsService()).passwordEncoder(new BCryptPasswordEncoder()); } @Bean @@ -135,11 +75,4 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { public TokenAuthenticationService tokenAuthenticationService() { return tokenAuthenticationService; } - - -// @Bean(name = "springSecurityFilterChain", autowire = Autowire.BY_NAME) -// public DelegatingFilterProxy springSecurityFilterChain(){ -// return new DelegatingFilterProxy(); -// } - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java index 1252d6f3..8fd352f4 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/handler/TokenHandler.java @@ -8,33 +8,28 @@ import org.springframework.security.core.userdetails.User; import com.jasamedika.medifirst2000.security.service.UserService; /** - * TokenHandler class - * using jjwt https://github.com/jwtk/jjwt - * + * TokenHandler class using jjwt jjwt + * * @author Roberto */ public class TokenHandler { - private final String secret; - private final UserService userService; - public TokenHandler(String secret, UserService userService) { - this.secret = secret; - this.userService = userService; - } + private final String secret; - public User parseUserFromToken(String token) { - String username = Jwts.parser() - .setSigningKey(secret) - .parseClaimsJws(token) - .getBody() - .getSubject(); - return userService.loadUserByUsername(username); - } + private final UserService userService; - public String createTokenForUser(User user) { - return Jwts.builder().setHeaderParam("typ", "JWT") - .setSubject(user.getUsername()) - .signWith(SignatureAlgorithm.HS512, secret) - .compact(); - } + public TokenHandler(String secret, UserService userService) { + this.secret = secret; + this.userService = userService; + } + + public User parseUserFromToken(String token) { + String username = Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody().getSubject(); + return userService.loadUserByUsername(username); + } + + public String createTokenForUser(User user) { + return Jwts.builder().setHeaderParam("typ", "JWT").setSubject(user.getUsername()) + .signWith(SignatureAlgorithm.HS512, secret).compact(); + } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java index 4025f543..d9966d2a 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/AppPermission.java @@ -6,20 +6,20 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * AppPermission annotation, digunakan untuk method yang butuh authorized dari database - * can use in method only. + * AppPermission annotation, digunakan untuk method yang butuh authorized dari + * database can use in method only. + * * @author Roberto */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) -public @interface AppPermission { - public static final int ADD = 100; - public static final int UPDATE = 200; - public static final int DELETE = 300; - public static final int PRINT = 400; - public static final int VIEW = 500; - - public static final int SPECIALS = 600; - +public @interface AppPermission { + int ADD = 100; + int UPDATE = 200; + int DELETE = 300; + int PRINT = 400; + int VIEW = 500; + int SPECIALS = 600; + int value(); } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/UserAuthentication.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/UserAuthentication.java index 6e3add0f..66bf54d2 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/UserAuthentication.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/model/UserAuthentication.java @@ -1,11 +1,11 @@ package com.jasamedika.medifirst2000.security.model; -import java.util.Collection; - import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; +import java.util.Collection; + /** * UserAuthentication class * @@ -16,7 +16,9 @@ public class UserAuthentication implements Authentication { * serialVersionUID */ private static final long serialVersionUID = -7410905698525654537L; + private final User user; + private boolean authenticated = true; public UserAuthentication(User user) { diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java index 0ed2b075..e832198b 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/TokenAuthenticationService.java @@ -1,71 +1,63 @@ package com.jasamedika.medifirst2000.security.service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.fasterxml.jackson.core.JsonParseException; +import com.jasamedika.medifirst2000.security.handler.TokenHandler; +import com.jasamedika.medifirst2000.security.model.UserAuthentication; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.User; import org.springframework.stereotype.Component; -import com.fasterxml.jackson.core.JsonParseException; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.security.handler.TokenHandler; -import com.jasamedika.medifirst2000.security.model.UserAuthentication; +import javax.servlet.http.HttpServletRequest; +import java.util.Objects; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.AUTH_HEADER_NAME; /** * TokenAuthenticationService class * * @author Roberto */ +@NoArgsConstructor +@Slf4j @Component public class TokenAuthenticationService { - public static TokenHandler tokenHandler; - - public TokenAuthenticationService() { - } + public static TokenHandler tokenHandler; public TokenAuthenticationService(String secret, UserService userService) { tokenHandler = new TokenHandler(secret, userService); } - public String addAuthentication(HttpServletResponse response, - UserAuthentication authentication) { + public String addAuthentication(UserAuthentication authentication) { final User user = authentication.getDetails(); - return tokenHandler.createTokenForUser(user); + return tokenHandler.createTokenForUser(user); } - public Authentication getAuthentication(HttpServletRequest request) - throws JsonParseException { - - String token = request.getHeader(WebConstants.AUTH_HEADER_NAME); + public Authentication getAuthentication(HttpServletRequest request) throws JsonParseException { + String token = request.getHeader(AUTH_HEADER_NAME); if (token != null) { final User user = tokenHandler.parseUserFromToken(token); - if (user != null) { + if (user != null) return new UserAuthentication(user); - } - } - else{ - try - { - if(request.getQueryString()=="")return null; - final String[] tokens= request.getQueryString().split("&"); + } else { + try { + if (Objects.equals(request.getQueryString(), "")) + return null; + final String[] tokens = request.getQueryString().split("&"); for (String tokenTemp : tokens) { - if(tokenTemp.toLowerCase().indexOf(WebConstants.AUTH_HEADER_NAME.toLowerCase())>=0) - { - token =tokenTemp.split("=")[1]; + if (tokenTemp.toLowerCase().contains(AUTH_HEADER_NAME.toLowerCase())) { + token = tokenTemp.split("=")[1]; final User user = tokenHandler.parseUserFromToken(token); if (user != null) { return new UserAuthentication(user); } } } + } catch (Exception e) { + log.error(e.getMessage()); } - catch(Exception e) - { - - } - } return null; } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java index b883d19e..9a27a7ae 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/security/service/UserService.java @@ -1,61 +1,48 @@ package com.jasamedika.medifirst2000.security.service; -import java.util.Arrays; -import java.util.List; - +import com.jasamedika.medifirst2000.dao.LoginUserDao; +import com.jasamedika.medifirst2000.entities.LoginUser; +import lombok.NoArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AccountStatusUserDetailsChecker; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; -import com.jasamedika.medifirst2000.dao.LoginUserDao; -import com.jasamedika.medifirst2000.entities.LoginUser; +import java.util.Collections; +import java.util.List; /** * UserService implements - org.springframework.security.core.userdetails.UserDetailsService + * org.springframework.security.core.userdetails.UserDetailsService * * @author Roberto */ +@NoArgsConstructor @Component -public class UserService implements - org.springframework.security.core.userdetails.UserDetailsService { +public class UserService implements UserDetailsService { @Autowired private LoginUserDao loginUserDao; private final AccountStatusUserDetailsChecker detailsChecker = new AccountStatusUserDetailsChecker(); - public UserService() { - super(); - } - /** * this method is called for rest authentication from client - * - * @author Roberto */ @Override - public final User loadUserByUsername(String username) - throws UsernameNotFoundException { + public final User loadUserByUsername(String username) throws UsernameNotFoundException { List loginUsers = loginUserDao.findByNamaUser(username); - if (loginUsers.isEmpty()) { + if (loginUsers.isEmpty()) throw new UsernameNotFoundException("user not found"); - } LoginUser loginUser = loginUsers.get(0); - //validasi tambahan lakukan di sini - -// GrantedAuthority authority = new SimpleGrantedAuthority(loginUser -// .getKelompokUser().getKelompokUser()); GrantedAuthority authority = new SimpleGrantedAuthority("USER"); - UserDetails userDetails = (UserDetails) new User( - loginUser.getNamaUser(), loginUser.getKataSandi(), - Arrays.asList(authority)); + User userDetails = new User(loginUser.getNamaUser(), loginUser.getKataSandi(), + Collections.singletonList(authority)); detailsChecker.check(userDetails); - return (User) userDetails; + return userDetails; } } \ No newline at end of file diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java index 5a5cf6bd..d1f9bacd 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/JacksonConfiguration.java @@ -1,5 +1,6 @@ package com.jasamedika.medifirst2000.util.rest; +import lombok.NoArgsConstructor; import org.springframework.stereotype.Component; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -7,23 +8,17 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +@NoArgsConstructor @Component public class JacksonConfiguration { - private ObjectMapper mapper; - - public JacksonConfiguration() { - } public JacksonConfiguration(ObjectMapper mapper) { - this.mapper = mapper; configureJackson(mapper); } - public static ObjectMapper configureJackson(ObjectMapper mapper) { + public static void configureJackson(ObjectMapper mapper) { mapper.enable(SerializationFeature.INDENT_OUTPUT); mapper.setSerializationInclusion(Include.NON_NULL); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, - false); - return mapper; + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java index 43cb5a0a..2372a2a7 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java @@ -1,16 +1,17 @@ package com.jasamedika.medifirst2000.util.rest; +import com.google.gson.Gson; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; - -import com.google.gson.Gson; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Rest Util Class @@ -24,78 +25,49 @@ public class RestUtil { /** * get JSON response from Object * - * @param src * @param * source class * @return @ResponseEntity */ public static ResponseEntity getJsonResponse(T src) { - HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get JSON response from Object with HTTP status - * - * @param src - * @param status + * * @param * source class * @return @ResponseEntity */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static ResponseEntity getJsonResponse(T src, HttpStatus status) { - HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - Map map = new HashMap(); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + Map map = new HashMap<>(); map.put("data", src); return new ResponseEntity(map, headers, status); } - /** - * - * @param src - * @param status - * @param mapHeaderMessage - * @param - * @return - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static ResponseEntity getJsonResponse(T src, HttpStatus status, Map mapHeaderMessage) { - HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("messages", mapHeaderMessage); map.put("data", src); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); return new ResponseEntity(map, headers, status); } - /** - * - * @param status - * @param mapHeaderMessage - * @return - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static ResponseEntity getJsonResponse(HttpStatus status, Map mapHeaderMessage) { HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - - Map map = new HashMap(); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + Map map = new HashMap<>(); map.put("messages", mapHeaderMessage); - return new ResponseEntity(map, headers, status); } @@ -106,114 +78,88 @@ public class RestUtil { * source class * @return @ResponseEntity */ - public static ResponseEntity getJsonHttptatus(HttpStatus status) { - - return new ResponseEntity(status); - + public static ResponseEntity getJsonHttpStatus(HttpStatus status) { + return new ResponseEntity<>(status); } - public static ResponseEntity getJsonHttptatus(HttpStatus status, Map mapHeaderMessage) { - + public static ResponseEntity getJsonHttpStatus(HttpStatus status, Map mapHeaderMessage) { HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity(headers, status); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(headers, status); } /** * get JSON response from Set Object * - * @param src * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(Set src) { - HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get JSON response from Set Object with custom header * - * @param src - * @param mapHeaderMessage * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(Set src, Map mapHeaderMessage) { - HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get JSON response from List Object with custom header * - * @param src - * @param mapHeaderMessage * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(List src, Map mapHeaderMessage) { HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get JSON response from List Object * - * @param src * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(List src) { - HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get default JSON response from Object * - * @param src * @return @ResponseEntity */ public static ResponseEntity defaultJsonResponse(Object src) { - Gson gson = new Gson(); - HttpHeaders headers = new HttpHeaders(); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity(gson.toJson(src), headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(gson.toJson(src), headers, OK); } /** @@ -223,8 +169,6 @@ public class RestUtil { * string source JSON * @param type * class type result - * @param - * @return */ public static T jsonToObject(String strJson, Class type) { Gson gson = new Gson(); @@ -234,12 +178,9 @@ public class RestUtil { /** * convert object to json * - * @param object - * @return */ public static String toJson(Object object) { Gson gson = new Gson(); return gson.toJson(object); } - } diff --git a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResult.java b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResult.java index faa7ed20..25b20b8b 100644 --- a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResult.java +++ b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResult.java @@ -1,11 +1,13 @@ package com.monitorjbl.json; -public class JsonResult { - private static final JsonResult instance = new JsonResult(); - private static final ThreadLocal current = new ThreadLocal<>(); +import lombok.NoArgsConstructor; - private JsonResult() { - } +@NoArgsConstructor +public class JsonResult { + + private static final JsonResult instance = new JsonResult(); + + private static final ThreadLocal> current = new ThreadLocal<>(); /** * Use the provided {@code JsonView} object to serialize the return value. @@ -16,7 +18,6 @@ public class JsonResult { * Type of object being rendered * @return ResultWrapper to provide return value */ - @SuppressWarnings("unchecked") public ResultWrapper use(JsonView view) { current.set(view); return new ResultWrapper<>(view); @@ -26,7 +27,7 @@ public class JsonResult { return instance; } - static JsonView get() { + static JsonView get() { return current.get(); } @@ -35,7 +36,7 @@ public class JsonResult { } public static class ResultWrapper { - private JsonView obj; + private final JsonView obj; private ResultWrapper(JsonView obj) { this.obj = obj; diff --git a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResultRetriever.java b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResultRetriever.java index 48bf0992..26492cec 100644 --- a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResultRetriever.java +++ b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonResultRetriever.java @@ -1,18 +1,14 @@ package com.monitorjbl.json; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class JsonResultRetriever { - private static final Logger log = LoggerFactory.getLogger(JsonResultRetriever.class); - static boolean hasValue() { - return JsonResult.get() != null; - } + static boolean hasValue() { + return JsonResult.get() != null; + } - static JsonView retrieve() { - JsonView val = JsonResult.get(); - JsonResult.unset(); - return val; - } + static JsonView retrieve() { + JsonView val = JsonResult.get(); + JsonResult.unset(); + return val; + } } diff --git a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewHttpEntityMethodProcessor.java b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewHttpEntityMethodProcessor.java index 4fe78048..cba552ab 100644 --- a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewHttpEntityMethodProcessor.java +++ b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewHttpEntityMethodProcessor.java @@ -11,23 +11,18 @@ import java.util.List; public class JsonViewHttpEntityMethodProcessor extends HttpEntityMethodProcessor { - public JsonViewHttpEntityMethodProcessor(List> converters) { - super(converters); - } - - @Override - public void handleReturnValue(Object returnValue, MethodParameter returnType, - - ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { - if(returnValue instanceof ResponseEntity && JsonResultRetriever.hasValue()) { - JsonView json = JsonResultRetriever.retrieve(); - ResponseEntity re = (ResponseEntity) returnValue; - returnValue = ResponseEntity.status(re.getStatusCode()) - .headers(re.getHeaders()) - .body(json); - } - - super.handleReturnValue(returnValue, returnType, mavContainer, webRequest); - } + public JsonViewHttpEntityMethodProcessor(List> converters) { + super(converters); + } + @Override + public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest) throws Exception { + if (returnValue instanceof ResponseEntity && JsonResultRetriever.hasValue()) { + JsonView json = JsonResultRetriever.retrieve(); + ResponseEntity re = (ResponseEntity) returnValue; + returnValue = ResponseEntity.status(re.getStatusCode()).headers(re.getHeaders()).body(json); + } + super.handleReturnValue(returnValue, returnType, mavContainer, webRequest); + } } diff --git a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewReturnValueHandler.java b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewReturnValueHandler.java index aeb728ce..c7706a45 100644 --- a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewReturnValueHandler.java +++ b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewReturnValueHandler.java @@ -11,30 +11,32 @@ import org.springframework.web.method.support.ModelAndViewContainer; import java.util.List; public class JsonViewReturnValueHandler implements HandlerMethodReturnValueHandler { - private static final Logger log = LoggerFactory.getLogger(JsonViewReturnValueHandler.class); - private final HandlerMethodReturnValueHandler delegate; + private static final Logger log = LoggerFactory.getLogger(JsonViewReturnValueHandler.class); - public JsonViewReturnValueHandler(List> converters) { - this.delegate = new JsonViewResponseProcessor(converters); - } + private final HandlerMethodReturnValueHandler delegate; - @Override - public boolean supportsReturnType(MethodParameter returnType) { - return delegate.supportsReturnType(returnType); - } + public JsonViewReturnValueHandler(List> converters) { + this.delegate = new JsonViewResponseProcessor(converters); + } - @Override - public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { - Object val = returnValue; - if(JsonResultRetriever.hasValue()) { - val = JsonResultRetriever.retrieve(); - log.debug("Found [" + ((JsonView) val).getValue().getClass() + "] to serialize"); - } else { - log.debug("No JsonView found for thread, using returned value"); - } + @Override + public boolean supportsReturnType(MethodParameter returnType) { + return delegate.supportsReturnType(returnType); + } - delegate.handleReturnValue(val, returnType, mavContainer, webRequest); - } + @Override + public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest) throws Exception { + Object val = returnValue; + if (JsonResultRetriever.hasValue()) { + val = JsonResultRetriever.retrieve(); + log.debug("Found [{}] to serialize", ((JsonView) val).getValue().getClass()); + } else { + log.debug("No JsonView found for thread, using returned value"); + } + + delegate.handleReturnValue(val, returnType, mavContainer, webRequest); + } } \ No newline at end of file diff --git a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java index 6eb9b92e..aee7cd2b 100644 --- a/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java +++ b/jasamedika-sdm/src/main/java/com/monitorjbl/json/JsonViewSupportFactoryBean.java @@ -15,38 +15,38 @@ import java.util.List; public class JsonViewSupportFactoryBean implements InitializingBean { - @Autowired - private RequestMappingHandlerAdapter adapter; - private final JsonViewMessageConverter converter; + private final JsonViewMessageConverter converter; - public JsonViewSupportFactoryBean() { - this(new ObjectMapper()); - } + @Autowired + private RequestMappingHandlerAdapter adapter; - public JsonViewSupportFactoryBean(ObjectMapper mapper) { - this.converter = new JsonViewMessageConverter(mapper.copy()); - } + public JsonViewSupportFactoryBean() { + this(new ObjectMapper()); + } - @Override - public void afterPropertiesSet() throws Exception { - List handlers = new ArrayList<>(adapter.getReturnValueHandlers()); - adapter.setMessageConverters(Collections.>singletonList(converter)); - decorateHandlers(handlers); - adapter.setReturnValueHandlers(handlers); - } + public JsonViewSupportFactoryBean(ObjectMapper mapper) { + this.converter = new JsonViewMessageConverter(mapper.copy()); + } - private void decorateHandlers(List handlers) { - List> converters = new ArrayList<>(adapter.getMessageConverters()); - converters.add(converter); - for(HandlerMethodReturnValueHandler handler : handlers) { - int index = handlers.indexOf(handler); - if(handler instanceof HttpEntityMethodProcessor) { - handlers.set(index, new JsonViewHttpEntityMethodProcessor(converters)); - } else if(handler instanceof RequestResponseBodyMethodProcessor) { - handlers.set(index, new JsonViewReturnValueHandler(converters)); - break; - } - } - } + @Override + public void afterPropertiesSet() { + List handlers = new ArrayList<>(adapter.getReturnValueHandlers()); + adapter.setMessageConverters(Collections.singletonList(converter)); + decorateHandlers(handlers); + adapter.setReturnValueHandlers(handlers); + } + private void decorateHandlers(List handlers) { + List> converters = new ArrayList<>(adapter.getMessageConverters()); + converters.add(converter); + for (HandlerMethodReturnValueHandler handler : handlers) { + int index = handlers.indexOf(handler); + if (handler instanceof HttpEntityMethodProcessor) { + handlers.set(index, new JsonViewHttpEntityMethodProcessor(converters)); + } else if (handler instanceof RequestResponseBodyMethodProcessor) { + handlers.set(index, new JsonViewReturnValueHandler(converters)); + break; + } + } + } } \ No newline at end of file diff --git a/jasamedika-sdm/src/main/webapp/WEB-INF/spring-security.xml b/jasamedika-sdm/src/main/webapp/WEB-INF/spring-security.xml index 98f7c8f1..1bb9e9f8 100644 --- a/jasamedika-sdm/src/main/webapp/WEB-INF/spring-security.xml +++ b/jasamedika-sdm/src/main/webapp/WEB-INF/spring-security.xml @@ -6,5 +6,5 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> - + \ No newline at end of file diff --git a/jasamedika-sdm/src/main/webapp/WEB-INF/springmvc-context.xml b/jasamedika-sdm/src/main/webapp/WEB-INF/springmvc-context.xml index 59aecb3b..dd2601cc 100644 --- a/jasamedika-sdm/src/main/webapp/WEB-INF/springmvc-context.xml +++ b/jasamedika-sdm/src/main/webapp/WEB-INF/springmvc-context.xml @@ -7,24 +7,25 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"> - - + - - + + - + @@ -38,23 +39,21 @@ class="com.jasamedika.medifirst2000.util.rest.JacksonConfiguration"> - - - - - + + - - + + - - + + @@ -64,12 +63,12 @@ class="com.mangofactory.swagger.configuration.DocumentationConfig" /> - - - - - - - + + + + + + \ No newline at end of file