diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java index fbb302b3..0be1c1c4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java @@ -156,13 +156,13 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse uploadPhotoCapture(vo.getImageURLData(), idFinger, model.getTr_date(), model.getTr_time(), resultDomain.getTr_no()); } + + HabsenVO resultVO = new HabsenVO(); + resultVO = presensiConverter.transferModelToVO(resultDomain, resultVO); + resultVO.setPegawai(vo.getPegawai()); + logAccService.putToLog(resultVO); } - HabsenVO resultVO = new HabsenVO(); - resultVO = presensiConverter.transferModelToVO(resultDomain, resultVO); - resultVO.setPegawai(vo.getPegawai()); - logAccService.putToLog(resultVO); - return result; } 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 b4f9fb1d..80d45739 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 @@ -78,6 +78,7 @@ import com.jasamedika.medifirst2000.service.KategoryTugasService; import com.jasamedika.medifirst2000.service.KedudukanService; import com.jasamedika.medifirst2000.service.KelompokKompetensiService; import com.jasamedika.medifirst2000.service.KompetensiService; +import com.jasamedika.medifirst2000.service.LogAccService; import com.jasamedika.medifirst2000.service.MapJabatanProfesiService; import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService; import com.jasamedika.medifirst2000.service.MasterEvaluasiJabatanService; @@ -427,6 +428,9 @@ public class SdmController extends LocaleController { @Autowired private ProfesiService profesiService; + @Autowired + private LogAccService logAccService; + @RequestMapping(value = "/save-custom-uraian-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo, HttpServletRequest request) throws ParseException { @@ -5612,18 +5616,48 @@ public class SdmController extends LocaleController { vo.setClientIPAddress(getClientIpAddress(request)); Map result = absensiPegawaiService.saveHabsensiPegawai(vo); - if (null != result) + if (null != result) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + logAccService.putToLog(vo); + } return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { + logAccService.putToLog(vo); + LOGGER.error("Got exception {} when save presensi pegawai", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { + logAccService.putToLog(vo); + LOGGER.error("Got exception {} when save presensi pegawai", jse.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.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); + } + } + + @RequestMapping(value = "/log-presensi-pegawai/", method = RequestMethod.POST) + public ResponseEntity putLogPresensiPegawai(@RequestBody HabsenVO vo, HttpServletRequest request) { + try { + logAccService.putToLog(vo); + + return RestUtil.getJsonResponse(true, HttpStatus.CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got exception {} when put log presensi pegawai", e.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got exception {} when put log presensi pegawai", jse.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } }