Update AbsensiPegawaiService
Perbaikan letak call put log presensi dan expose api untuk put log presensi di front-end jika error
This commit is contained in:
parent
92bce8e70c
commit
f8dc85b616
@ -156,13 +156,13 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse
|
|||||||
uploadPhotoCapture(vo.getImageURLData(), idFinger, model.getTr_date(), model.getTr_time(),
|
uploadPhotoCapture(vo.getImageURLData(), idFinger, model.getTr_date(), model.getTr_time(),
|
||||||
resultDomain.getTr_no());
|
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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -78,6 +78,7 @@ import com.jasamedika.medifirst2000.service.KategoryTugasService;
|
|||||||
import com.jasamedika.medifirst2000.service.KedudukanService;
|
import com.jasamedika.medifirst2000.service.KedudukanService;
|
||||||
import com.jasamedika.medifirst2000.service.KelompokKompetensiService;
|
import com.jasamedika.medifirst2000.service.KelompokKompetensiService;
|
||||||
import com.jasamedika.medifirst2000.service.KompetensiService;
|
import com.jasamedika.medifirst2000.service.KompetensiService;
|
||||||
|
import com.jasamedika.medifirst2000.service.LogAccService;
|
||||||
import com.jasamedika.medifirst2000.service.MapJabatanProfesiService;
|
import com.jasamedika.medifirst2000.service.MapJabatanProfesiService;
|
||||||
import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService;
|
import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService;
|
||||||
import com.jasamedika.medifirst2000.service.MasterEvaluasiJabatanService;
|
import com.jasamedika.medifirst2000.service.MasterEvaluasiJabatanService;
|
||||||
@ -427,6 +428,9 @@ public class SdmController extends LocaleController<AkunVO> {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ProfesiService profesiService;
|
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)
|
@RequestMapping(value = "/save-custom-uraian-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||||
public ResponseEntity<Map<String, Object>> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo,
|
public ResponseEntity<Map<String, Object>> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo,
|
||||||
HttpServletRequest request) throws ParseException {
|
HttpServletRequest request) throws ParseException {
|
||||||
@ -5612,18 +5616,48 @@ public class SdmController extends LocaleController<AkunVO> {
|
|||||||
vo.setClientIPAddress(getClientIpAddress(request));
|
vo.setClientIPAddress(getClientIpAddress(request));
|
||||||
|
|
||||||
Map<String, Object> result = absensiPegawaiService.saveHabsensiPegawai(vo);
|
Map<String, Object> result = absensiPegawaiService.saveHabsensiPegawai(vo);
|
||||||
if (null != result)
|
if (null != result) {
|
||||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||||
|
} else {
|
||||||
|
logAccService.putToLog(vo);
|
||||||
|
}
|
||||||
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
|
||||||
} catch (ServiceVOException e) {
|
} catch (ServiceVOException e) {
|
||||||
|
logAccService.putToLog(vo);
|
||||||
|
|
||||||
LOGGER.error("Got exception {} when save presensi pegawai", e.getMessage());
|
LOGGER.error("Got exception {} when save presensi pegawai", e.getMessage());
|
||||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
|
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
|
||||||
return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
|
return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
|
||||||
} catch (JpaSystemException jse) {
|
} catch (JpaSystemException jse) {
|
||||||
|
logAccService.putToLog(vo);
|
||||||
|
|
||||||
LOGGER.error("Got exception {} when save presensi pegawai", jse.getMessage());
|
LOGGER.error("Got exception {} when save presensi pegawai", jse.getMessage());
|
||||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
|
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
|
||||||
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
|
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<Boolean> 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user