diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index 4b16a514..0a07aa92 100644 --- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -1,12 +1,10 @@ package com.jasamedika.medifirst2000.interceptor; -import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.lang.reflect.Method; /** * Interceptor class for All annotation method controller @AppPermission @@ -17,8 +15,6 @@ public class AppInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { - HandlerMethod hm = (HandlerMethod) handler; - Method method = hm.getMethod(); return true; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/logging/dao/JenisLogDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenisLogDao.java similarity index 72% rename from jasamedika-business/src/main/java/com/jasamedika/medifirst2000/logging/dao/JenisLogDao.java rename to jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenisLogDao.java index 121ab3cb..468e3530 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/logging/dao/JenisLogDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenisLogDao.java @@ -1,4 +1,4 @@ -package com.jasamedika.medifirst2000.logging.dao; +package com.jasamedika.medifirst2000.dao; import com.jasamedika.medifirst2000.entities.JenisLog; import org.springframework.data.jpa.repository.JpaRepository; @@ -9,6 +9,4 @@ import org.springframework.data.jpa.repository.JpaRepository; * @since 31/01/2024 */ public interface JenisLogDao extends JpaRepository { - - boolean existsByJenisLog(String jenisLog); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JenisLogService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JenisLogService.java new file mode 100644 index 00000000..5df34e97 --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JenisLogService.java @@ -0,0 +1,15 @@ +package com.jasamedika.medifirst2000.service; + +import com.jasamedika.medifirst2000.vo.JenisLogVO; + +import java.util.List; + +/** + * @author Salman + * @version 1.0.0 + * @since 02/02/2024 + */ +public interface JenisLogService { + + void save(List vos); +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisLogServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisLogServiceImpl.java new file mode 100644 index 00000000..af8e23b6 --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisLogServiceImpl.java @@ -0,0 +1,39 @@ +package com.jasamedika.medifirst2000.service.impl; + +import com.jasamedika.medifirst2000.converter.base.BaseVoConverter; +import com.jasamedika.medifirst2000.entities.JenisLog; +import com.jasamedika.medifirst2000.dao.JenisLogDao; +import com.jasamedika.medifirst2000.service.JenisLogService; +import com.jasamedika.medifirst2000.vo.JenisLogVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Salman + * @version 1.0.0 + * @since 02/02/2024 + */ +@Service +@Transactional +public class JenisLogServiceImpl implements JenisLogService { + + @Autowired + private BaseVoConverter jenisLogVoConverter; + + @Autowired + private JenisLogDao jenisLogDao; + + @Override + public void save(List vos) { + List entities = new ArrayList<>(); + vos.forEach(vo -> { + JenisLog entity = jenisLogVoConverter.transferVOToModel(vo, new JenisLog()); + entities.add(entity); + }); + jenisLogDao.save(entities); + } +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index bfa1e99a..f8170f95 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -3221,7 +3221,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pembulatan", "-"); result.put("remunerasiKinerja", "-"); result.put("feeForService", "-"); - result.put("remunerasiOperasional", "-"); result.put("kelebihanJamKerja", "-"); result.put("remunerasiManajerial", "-"); result.put("remunerasiTambahanDiklitjar", "-"); @@ -3238,7 +3237,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("simpananWajibKoperasiGaji", "-"); result.put("pinjamanKoperasiGaji", "-"); result.put("potonganPphRemunerasi", "-"); - result.put("potonganPphRemunerasiOperasional", "-"); result.put("potonganObat", "-"); result.put("potonganRawatInap", "-"); result.put("potonganRawatJalan", "-"); @@ -3301,8 +3299,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("remunerasiKinerja", nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { result.put("feeForService", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - result.put("remunerasiOperasional", nf.format(k.getNominal())); } else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) { result.put("kelebihanJamKerja", nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) { @@ -3335,8 +3331,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiGaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { result.put("potonganPphRemunerasi", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - result.put("potonganPphRemunerasiOperasional", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { result.put("potonganObat", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) { @@ -3476,8 +3470,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic penerimaanDtoBuilder.remunerasiKinerja(nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { penerimaanDtoBuilder.feeForService(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal())); } else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) { penerimaanDtoBuilder.kelebihanJamKerja(nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) { @@ -3510,8 +3502,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - potonganDtoBuilder.potonganPphRemunerasiOperasional(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganObat(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) { @@ -3555,10 +3545,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic jumlahPenerimaanBersih = jumlahGajiBersih.add(jumlahRemunerasiBersih).add(jumlahUangMakanBersih); jumlahDtoBuilder.jumlahPenerimaanBersih(nf.format(jumlahPenerimaanBersih)); } - resultBuilder.pegawaiDto(pegawaiDtoBuilder.build()); - resultBuilder.penerimaanDto(penerimaanDtoBuilder.build()); - resultBuilder.potonganDto(potonganDtoBuilder.build()); - resultBuilder.jumlahDto(jumlahDtoBuilder.build()); + resultBuilder.pegawai(pegawaiDtoBuilder.build()); + resultBuilder.penerimaan(penerimaanDtoBuilder.build()); + resultBuilder.potongan(potonganDtoBuilder.build()); + resultBuilder.jumlah(jumlahDtoBuilder.build()); } SlipHeaderDto result = resultBuilder.build(); if (CommonUtil.isNullOrEmpty(result.getPegawai())) { diff --git a/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index c477fb4e..84fdce48 100644 --- a/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java index 44609b85..95e3638c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java @@ -4,11 +4,17 @@ package com.jasamedika.medifirst2000.dto; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; /** * @author Salman * @since May 16th, 2023 */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder public class SlipHeaderDto { @Caption(value = "Pegawai") private SlipPegawaiDto pegawai; @@ -24,101 +30,4 @@ public class SlipHeaderDto { @Caption(value = "Print") private String print; - - public SlipHeaderDto() { - } - - public SlipHeaderDto(SlipPegawaiDto pegawai, SlipPenerimaanDto penerimaan, SlipPotonganDto potongan, - SlipJumlahDto jumlah, String print) { - super(); - this.pegawai = pegawai; - this.penerimaan = penerimaan; - this.potongan = potongan; - this.jumlah = jumlah; - this.print = print; - } - - public SlipPegawaiDto getPegawai() { - return pegawai; - } - - public void setPegawai(SlipPegawaiDto pegawai) { - this.pegawai = pegawai; - } - - public SlipPenerimaanDto getPenerimaan() { - return penerimaan; - } - - public void setPenerimaan(SlipPenerimaanDto penerimaan) { - this.penerimaan = penerimaan; - } - - public SlipPotonganDto getPotongan() { - return potongan; - } - - public void setPotongan(SlipPotonganDto potongan) { - this.potongan = potongan; - } - - public SlipJumlahDto getJumlah() { - return jumlah; - } - - public void setJumlah(SlipJumlahDto jumlah) { - this.jumlah = jumlah; - } - - public String getPrint() { - return print; - } - - public void setPrint(String print) { - this.print = print; - } - - public static SlipHeaderDtoBuilder builder() { - return new SlipHeaderDtoBuilder(); - } - - public static class SlipHeaderDtoBuilder { - private SlipPegawaiDto pegawai; - private SlipPenerimaanDto penerimaan; - private SlipPotonganDto potongan; - private SlipJumlahDto jumlah; - private String print; - - public SlipHeaderDtoBuilder() { - } - - public SlipHeaderDtoBuilder pegawaiDto(final SlipPegawaiDto pegawai) { - this.pegawai = pegawai; - return this; - } - - public SlipHeaderDtoBuilder penerimaanDto(final SlipPenerimaanDto penerimaan) { - this.penerimaan = penerimaan; - return this; - } - - public SlipHeaderDtoBuilder potonganDto(final SlipPotonganDto potongan) { - this.potongan = potongan; - return this; - } - - public SlipHeaderDtoBuilder jumlahDto(final SlipJumlahDto jumlah) { - this.jumlah = jumlah; - return this; - } - - public SlipHeaderDtoBuilder print(final String print) { - this.print = print; - return this; - } - - public SlipHeaderDto build() { - return new SlipHeaderDto(this.pegawai, this.penerimaan, this.potongan, this.jumlah, this.print); - } - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java index 8aa0f018..0113760c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java @@ -61,10 +61,6 @@ public class SlipPenerimaanDto { @Builder.Default private String feeForService = "-"; - @Caption(value = "Remunerasi Operasional") - @Builder.Default - private String remunerasiOperasional = "-"; - @Caption(value = "Kelebihan Jam Kerja") @Builder.Default private String kelebihanJamKerja = "-"; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java index 8dddb975..bfb15512 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java @@ -57,10 +57,6 @@ public class SlipPotonganDto { @Builder.Default private String potonganPphRemunerasi = "-"; - @Caption(value = "Potongan PPH Remunerasi Operasional") - @Builder.Default - private String potonganPphRemunerasiOperasional = "-"; - @Caption(value = "Potongan Obat") @Builder.Default private String potonganObat = "-"; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisLog.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisLog.java index 3384585b..1dd5d3a8 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisLog.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisLog.java @@ -6,12 +6,12 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.validator.constraints.NotBlank; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; +import javax.validation.constraints.Size; import java.io.Serializable; +import static javax.persistence.GenerationType.SEQUENCE; + /** * @author Salman * @version 1.0.0 @@ -25,10 +25,13 @@ public class JenisLog extends BaseActive implements Serializable { private static final long serialVersionUID = -5796583173860610757L; @Id - @Column(name = "id", columnDefinition = "bigserial") + @GeneratedValue(strategy = SEQUENCE, generator = "sg_jenis_log_m") + @SequenceGenerator(name = "sg_jenis_log_m", sequenceName = "jenis_log_m_seq", allocationSize = 1) + @Column(name = "id") protected Long id; - @Column(nullable = false) + @Column(length = 150, unique = true, nullable = false) + @Size(max = 150) @NotBlank @Caption("Jenis Log") private String jenisLog; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java index 672c4206..a370b24b 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java @@ -52,4 +52,9 @@ public class UserLogging extends BaseMaster { @Column(name = "keterangan", length = 200) @Caption(value = "Keterangan") private String keterangan; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "jenislogfk") + @Caption(value = "Jenis Log FK") + private JenisLog jenisLogFk; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisLogVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisLogVO.java index 8313b03b..9a471ba2 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisLogVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisLogVO.java @@ -1,5 +1,6 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseActiveVO; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; @@ -12,7 +13,7 @@ import org.hibernate.validator.constraints.NotBlank; */ @Getter @Setter -public class JenisLogVO { +public class JenisLogVO extends BaseActiveVO { protected Long id; @NotBlank diff --git a/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index f9a05c6b..b4622711 100644 --- a/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -293,7 +292,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index c477fb4e..84fdce48 100644 --- a/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index c477fb4e..84fdce48 100644 --- a/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index a170ba63..94947677 100644 --- a/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -97,8 +97,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -177,7 +176,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -229,7 +228,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -293,7 +292,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index 2b69263b..058aa2e2 100644 --- a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index c477fb4e..84fdce48 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 041e9962..21290ed7 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -18,7 +18,6 @@ - @@ -30,7 +29,6 @@ - @@ -65,7 +63,7 @@ - + @@ -966,52 +964,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1021,7 +974,7 @@ - + @@ -1047,7 +1000,7 @@ - + @@ -1057,7 +1010,7 @@ - + @@ -1068,7 +1021,7 @@ - + @@ -1083,7 +1036,7 @@ - + @@ -1093,7 +1046,7 @@ - + @@ -1104,7 +1057,7 @@ - + @@ -1119,7 +1072,7 @@ - + @@ -1131,7 +1084,7 @@ - + @@ -1141,7 +1094,7 @@ - + @@ -1157,7 +1110,7 @@ - + @@ -1169,7 +1122,7 @@ - + @@ -1179,7 +1132,7 @@ - + @@ -1195,7 +1148,7 @@ - + @@ -1205,7 +1158,7 @@ - + @@ -1213,7 +1166,7 @@ - + @@ -1229,7 +1182,7 @@ - + @@ -1239,7 +1192,7 @@ - + @@ -1250,7 +1203,7 @@ - + @@ -1261,7 +1214,7 @@ - + @@ -1276,7 +1229,7 @@ - + @@ -1289,7 +1242,7 @@ - + @@ -1301,7 +1254,7 @@ - + @@ -1313,7 +1266,7 @@ - + @@ -1328,7 +1281,7 @@ - + @@ -1341,7 +1294,7 @@ - + @@ -1356,7 +1309,7 @@ - + @@ -1372,7 +1325,7 @@ - + @@ -1383,7 +1336,7 @@ - + @@ -1396,7 +1349,7 @@ - + @@ -1406,7 +1359,7 @@ - + @@ -1422,7 +1375,7 @@ - + @@ -1435,7 +1388,7 @@ - + @@ -1450,7 +1403,7 @@ - + @@ -1464,7 +1417,7 @@ - + @@ -1479,7 +1432,7 @@ - + @@ -1490,7 +1443,7 @@ - + @@ -1501,7 +1454,7 @@ - + @@ -1511,7 +1464,7 @@ - + @@ -1522,7 +1475,7 @@ - + @@ -1533,7 +1486,7 @@ - + @@ -1544,7 +1497,7 @@ - + @@ -1555,7 +1508,7 @@ - + @@ -1565,7 +1518,7 @@ - + @@ -1589,7 +1542,7 @@ - + @@ -1602,7 +1555,7 @@ - + @@ -1615,7 +1568,7 @@ - + @@ -1629,7 +1582,7 @@ - + @@ -1645,7 +1598,7 @@ - + @@ -1661,7 +1614,7 @@ - + @@ -1691,7 +1644,7 @@ - + @@ -1706,7 +1659,7 @@ - + @@ -1717,7 +1670,7 @@ - + @@ -1763,7 +1716,7 @@ - + @@ -1771,7 +1724,7 @@ - + @@ -1779,7 +1732,7 @@ - + @@ -1787,7 +1740,7 @@ - + @@ -1795,7 +1748,7 @@ - + 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 a170ba63..94947677 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 @@ -97,8 +97,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -177,7 +176,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -229,7 +228,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -293,7 +292,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return; diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java new file mode 100644 index 00000000..66bb19c4 --- /dev/null +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java @@ -0,0 +1,47 @@ +package com.jasamedika.medifirst2000.controller; + +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.JenisLogService; +import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.JenisLogVO; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; + +import static org.slf4j.LoggerFactory.getLogger; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; + +/** + * @author Salman + * @version 1.0.0 + * @since 02/02/2024 + */ +@RestController +@RequestMapping("/log/jenis") +public class JenisLogController { + private static final Logger LOGGER = getLogger(JenisLogController.class); + + @Autowired + private JenisLogService jenisLogService; + + @RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity addVO(@Valid @RequestBody List vos, HttpServletRequest request) { + try { + jenisLogService.save(vos); + return RestUtil.getJsonResponse(CREATED.getReasonPhrase(), CREATED); + } catch (ServiceVOException e) { + LOGGER.error("Got exception {} when add Agama", e.getMessage()); + return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR); + } + } +} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java index c477fb4e..84fdce48 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/interceptor/AppInterceptor.java @@ -96,8 +96,7 @@ public class AppInterceptor implements HandlerInterceptor { return potongan.toString(); } - private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response, String AlamatUrlForm, - boolean supervisi) throws Exception { + private boolean checkAuthSecure(HttpServletRequest request, HttpServletResponse response) throws Exception { Authentication authentication = tokenAuthenticationService.getAuthentication(request); namaUser = authentication.getName(); loginUser = loginUserDao.findByNamaUser(namaUser); @@ -176,7 +175,7 @@ public class AppInterceptor implements HandlerInterceptor { .findByAlamatUrlForm(filterUrlForm(AlamatUrlForm)); if (CommonUtil.isNullOrEmpty(objekModulAplikasi)) return true; - if (!checkAuthSecure(request, response, AlamatUrlForm, false)) + if (!checkAuthSecure(request, response)) return false; int resultUser = checkUserPermision(loginUser.get(0), objekModulAplikasi.get(0), action); if (resultUser == 0) { @@ -228,7 +227,7 @@ public class AppInterceptor implements HandlerInterceptor { hm = (HandlerMethod) handler; method = hm.getMethod(); } else { - return checkAuthSecure(request, response, AlamatUrlForm, true); + return checkAuthSecure(request, response); } boolean usingAnno = method != null && method.isAnnotationPresent(AppPermission.class); boolean postM = "POST".equals(methodHttp); @@ -292,7 +291,12 @@ public class AppInterceptor implements HandlerInterceptor { : request.getHeader(Constants.HttpHeader.TGL_KIRIM); boolean notHttpOK = response.getStatus() >= HttpServletResponse.SC_BAD_REQUEST; boolean notLewatMenu = CommonUtil.isNullOrEmpty(AlamatUrlForm) || CommonUtil.isNullOrEmpty(KdRuangan); - Integer ruanganAsalId = Integer.parseInt(KdRuangan); + Integer ruanganAsalId; + try { + ruanganAsalId = Integer.parseInt(KdRuangan); + } catch (NumberFormatException e) { + ruanganAsalId = 0; + } boolean adaError = CommonUtil.isNotNullOrEmpty(ex); if (notHttpOK || notLewatMenu || adaError) return;