From c7c751e61ffadb0c84ce3b4d588cf6de2e79685a Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 13 Mar 2025 09:13:08 +0700 Subject: [PATCH] Update base project and config clean code --- Medifirst2000/{readme.txt => readme.md} | 2 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../impl/IpsrsMaintenanceDaoCustomImpl.java | 15 +- ...AdmisiRencanaPindahRuanganServiceImpl.java | 48 +- .../service/impl/AnggaranServiceImpl.java | 4 +- .../impl/B3RuanganInputDataServiceImpl.java | 27 +- .../impl/DaftarStrukPenjualanServiceImpl.java | 4 +- ...taPerusahanYangBekerjaSamaServiceImpl.java | 17 +- .../impl/DiagnosaPasienServiceImpl.java | 38 +- .../service/impl/HVAServiceImpl.java | 16 +- .../impl/HistoriPelayananCsServiceImpl.java | 54 +- .../impl/IkiDanRemunerasiServiceImpl.java | 4 +- .../service/impl/IndekKinerjaServiceImpl.java | 10 +- .../impl/IpsrsMaintenanceServiceImpl.java | 47 +- .../impl/IpsrsPemakaianMesinServiceImpl.java | 26 +- .../IpsrsPemakaianRuanganServiceImpl.java | 18 +- .../impl/IpsrsPeminjamanAlatServiceImpl.java | 30 +- .../impl/IpsrsPerbaikanServiceImpl.java | 44 +- ...IpsrsPreventiveMaintenanceServiceImpl.java | 33 +- ...IpsrsTagihanBusinessCenterServiceImpl.java | 15 +- .../service/impl/ItPerbaikanServiceImpl.java | 48 +- ...K3CheckListFacillitySefetyServiceImpl.java | 16 +- .../K3LaporanKecelakaanKerjaServiceImpl.java | 38 +- .../impl/KartuPengendaliServiceImpl.java | 87 +-- .../service/impl/LaundryServiceImpl.java | 2 +- .../impl/MonitoringAbsenServiceImpl.java | 10 +- .../impl/OrderPelayananSistemServiceImpl.java | 36 +- .../service/impl/PapCatatanServiceImpl.java | 21 +- .../impl/PapGinekologiServiceImpl.java | 32 +- .../impl/PapInformasiIbuServiceImpl.java | 29 +- .../impl/PapRiwayatImunisasiServiceImpl.java | 19 +- .../PapRiwayatTumbuhKembangServiceImpl.java | 22 +- .../impl/PapSkriningGiziServiceImpl.java | 41 +- .../impl/PapStatusFungsionalServiceImpl.java | 24 +- .../PegawaiMutasiSanksiResignServiceImpl.java | 12 +- .../impl/PelayananObatServiceImpl.java | 155 +--- .../impl/PemakaianRumahDukaServiceImpl.java | 39 +- .../impl/PemulasaraanJenazahServiceImpl.java | 44 +- .../impl/PencucianLinenServiceImpl.java | 17 +- .../impl/PenerimaanLinenServiceImpl.java | 38 +- .../impl/PengirimanBarangServiceImpl.java | 15 +- .../impl/PengkajianAwalBaruServiceImpl.java | 18 +- .../PengkajianAwalTransaksiServiceImpl.java | 29 +- .../PengkajianKebutuhanDasarServiceImpl.java | 15 +- ...engkajianLanjutanTransaksiServiceImpl.java | 18 +- .../PenilaianKinerjaSatpamServiceImpl.java | 31 +- .../impl/PermohonanStatusPegawaiImpl.java | 6 +- ...PlanningHistoriPelayananCsServiceImpl.java | 45 +- .../RegistrasiPasienRawatInapServiceImpl.java | 113 +-- .../impl/RegistrasiPelayananServiceImpl.java | 2 +- ...PenilaianKompetensiPegawaiServiceImpl.java | 41 +- .../service/impl/StrukHistoriServiceImpl.java | 56 +- .../service/impl/StrukOrderServiceImpl.java | 81 +- .../TransferPasienInternalServiceImpl.java | 2 +- .../impl/UploadDownloadImageServiceImpl.java | 18 +- .../impl/UraianTugasTransaksiServiceImpl.java | 55 +- .../main/resources/META-INF/persistence.xml | 30 +- .../jasamedika/medifirst2000/Stock.hbm.xml | 31 - .../main/resources/logback-development.xml | 17 - .../src/main/resources/logback-production.xml | 3 - .../src/main/resources/logback.xml | 11 +- .../src/main/resources/messages_en.properties | 2 +- .../main/resources/messages_ina.properties | 4 +- jasamedika-core/pom.xml | 8 + .../jasamedika/medifirst2000/base/Base.java | 32 - .../medifirst2000/base/BaseActive.java | 21 +- .../medifirst2000/base/BaseBridging.java | 24 - .../medifirst2000/base/BaseMapping.java | 8 - .../medifirst2000/base/BaseMaster.java | 47 +- .../base/BaseMasterJadwalDokter.java | 100 --- .../medifirst2000/base/BaseMasterPasien.java | 100 --- .../medifirst2000/base/BaseMasterPegawai.java | 100 --- .../medifirst2000/base/BaseMasterProduk.java | 80 -- .../base/BaseMasterStokProdukGlobal.java | 100 --- .../medifirst2000/base/BaseModel.java | 234 ++---- .../medifirst2000/base/BaseProfile.java | 18 +- .../medifirst2000/base/BaseTransaction.java | 33 +- .../medifirst2000/base/vo/BaseActiveVO.java | 18 +- .../medifirst2000/base/vo/BaseMappingVO.java | 8 - .../medifirst2000/base/vo/BaseMasterVO.java | 51 +- .../medifirst2000/base/vo/BaseModelVO.java | 429 ++--------- .../medifirst2000/base/vo/BaseProfileVO.java | 22 +- .../base/vo/BaseTransactionVO.java | 19 +- .../medifirst2000/base/vo/BaseVO.java | 27 - .../base/vo/validation/FieldErrorVO.java | 20 +- .../base/vo/validation/ValidationErrorVO.java | 14 +- .../medifirst2000/core/web/WebConstants.java | 2 +- .../medifirst2000/enums/MetodeHargaEnum.java | 16 - .../medifirst2000/enums/Status.java | 16 +- .../medifirst2000/enums/StatusAnggaran.java | 20 - .../enums/StatusAntrianEnum.java | 37 +- .../medifirst2000/enums/StatusCodeEnum.java | 16 - .../medifirst2000/enums/StatusGiziEnum.java | 24 +- .../enums/StatusKunjunganEnum.java | 19 +- .../medifirst2000/enums/StatusNegPosEnum.java | 18 +- .../enums/StatusPenyakitEnum.java | 19 +- .../medifirst2000/enums/TipePasienEnum.java | 19 +- .../medifirst2000/enums/VerifikasiEnum.java | 42 +- .../helper/EmailCustomAnnotation.java | 13 - .../jasamedika/medifirst2000/util/Age.java | 31 +- .../medifirst2000/util/AgeCalculator.java | 111 ++- .../medifirst2000/util/Base32Util.java | 97 --- .../{enums => util}/BaseModelEnum.java | 2 +- .../medifirst2000/util/CommonUtil.java | 95 +-- .../medifirst2000/util/CurrencyUtil.java | 51 +- .../medifirst2000/util/DateUtil.java | 95 +-- .../medifirst2000/util/ExcelGajiPegawai.java | 251 +------ .../medifirst2000/util/ExcelUangMakan.java | 10 - .../util/ExtendedSpringBeanUtil.java | 168 ++--- .../medifirst2000/util/HelloWorldUtil.java | 12 - .../medifirst2000/util/ImageUtil.java | 57 +- .../util/IndonesianNumberToWords.java | 55 +- .../medifirst2000/util/JsonUtil.java | 702 ++++++------------ .../medifirst2000/util/MathUtil.java | 10 +- .../medifirst2000/util/PasswordUtil.java | 66 +- .../medifirst2000/util/RomawiNumberUtil.java | 10 +- .../medifirst2000/util/StringUtil.java | 91 +-- .../medifirst2000/util/SystemUtil.java | 120 +-- .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../medifirst2000/entities/JadwalDokter.java | 12 +- .../entities/LisOrderSysmex.java | 4 +- .../entities/LisOrderTmpSysmex.java | 4 +- .../medifirst2000/entities/NamaPegawai.java | 4 - .../medifirst2000/entities/Pegawai.java | 11 +- .../medifirst2000/entities/Produk.java | 12 +- .../entities/StokProdukGlobal.java | 12 +- .../medifirst2000/vo/CssdAlatVO.java | 14 +- .../medifirst2000/vo/CssdBmhpVO.java | 24 +- .../medifirst2000/vo/CssdSetAlatVO.java | 12 +- .../medifirst2000/vo/DokumenTemplateVO.java | 2 - .../vo/JadwalPraktikDokterVO.java | 2 - .../vo/MapKebutuhanSaranaToKamarVO.java | 1 - .../vo/MapPegawaiLaboratRadiologiVO.java | 2 - .../vo/NotifMessagingSchedulerVO.java | 2 - .../medifirst2000/vo/NotifMessagingVO.java | 2 - .../vo/NotifikasiMessageObjekModulVO.java | 2 - .../medifirst2000/vo/PegawaiJabatanVO.java | 2 - .../medifirst2000/vo/RisikoGiziVO.java | 2 - .../vo/StandarPelayananMakananVO.java | 2 - .../medifirst2000/vo/UnitCostVO.java | 2 - .../vo/UnitPengelolaPrakarsaSuratVO.java | 2 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 42 -- .../controller/base/RestPageController.java | 38 - .../controller/base/BaseRestController.java | 32 - .../controller/base/RestPageController.java | 39 - 159 files changed, 1432 insertions(+), 5124 deletions(-) rename Medifirst2000/{readme.txt => readme.md} (99%) delete mode 100644 jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/Stock.hbm.xml delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/Base.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseBridging.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMapping.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterJadwalDokter.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPasien.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPegawai.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterStokProdukGlobal.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMappingVO.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseVO.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/MetodeHargaEnum.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAnggaran.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusCodeEnum.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/helper/EmailCustomAnnotation.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Base32Util.java rename jasamedika-core/src/main/java/com/jasamedika/medifirst2000/{enums => util}/BaseModelEnum.java (80%) delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelUangMakan.java delete mode 100644 jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/HelloWorldUtil.java delete mode 100644 jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-it/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-it/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java delete mode 100644 jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java diff --git a/Medifirst2000/readme.txt b/Medifirst2000/readme.md similarity index 99% rename from Medifirst2000/readme.txt rename to Medifirst2000/readme.md index c74d5c5e..a12394b7 100644 --- a/Medifirst2000/readme.txt +++ b/Medifirst2000/readme.md @@ -8,8 +8,6 @@ business : berisi Service, Repository/DAO dan class Business web : berisi REST Controller web-push : berisi implementasi untuk push notification using WebServlet async=true - - Untuk menjalankan projectnya : - Siapkan database Postgree diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/IpsrsMaintenanceDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/IpsrsMaintenanceDaoCustomImpl.java index 5608c2f6..50a8509a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/IpsrsMaintenanceDaoCustomImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/IpsrsMaintenanceDaoCustomImpl.java @@ -1,10 +1,5 @@ package com.jasamedika.medifirst2000.dao.custom.impl; -import javax.persistence.Query; - -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - import com.jasamedika.medifirst2000.dao.custom.IpsrsMaintenanceDaoCustom; import com.jasamedika.medifirst2000.dao.custom.base.impl.CoreDaoImpl; import com.jasamedika.medifirst2000.entities.IpsrsKalibrasi; @@ -12,6 +7,10 @@ import com.jasamedika.medifirst2000.entities.IpsrsKontakService; import com.jasamedika.medifirst2000.entities.IpsrsMaintenance; import com.jasamedika.medifirst2000.entities.IpsrsPemeliharaan; import com.jasamedika.medifirst2000.util.CommonUtil; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.Query; @Repository public class IpsrsMaintenanceDaoCustomImpl extends @@ -25,7 +24,7 @@ public class IpsrsMaintenanceDaoCustomImpl extends @Transactional public void deleteIpsrsPemeliharaan(IpsrsMaintenance model){ try{ - IpsrsPemeliharaan ipsrsPemeliharaan = em.find(IpsrsPemeliharaan.class, model.getIpsrsPemeliharaan().noRec); + IpsrsPemeliharaan ipsrsPemeliharaan = em.find(IpsrsPemeliharaan.class, model.getIpsrsPemeliharaan().getNoRec()); em.remove(em.contains(ipsrsPemeliharaan) ? ipsrsPemeliharaan : em.merge(ipsrsPemeliharaan)); }catch (Exception ex){ ex.printStackTrace(); @@ -36,7 +35,7 @@ public class IpsrsMaintenanceDaoCustomImpl extends @Transactional public void deleteIpsrsKontakService(IpsrsMaintenance model){ try{ - IpsrsKontakService ipsrsKontakService = em.find(IpsrsKontakService.class, model.getIpsrsKontakService().noRec); + IpsrsKontakService ipsrsKontakService = em.find(IpsrsKontakService.class, model.getIpsrsKontakService().getNoRec()); em.remove(em.contains(ipsrsKontakService) ? ipsrsKontakService : em.merge(ipsrsKontakService)); }catch (Exception ex){ ex.printStackTrace(); @@ -47,7 +46,7 @@ public class IpsrsMaintenanceDaoCustomImpl extends @Transactional public void deleteIpsrsKalibrasi(IpsrsMaintenance model){ try{ - IpsrsKalibrasi ipsrsKalibrasi = em.find(IpsrsKalibrasi.class, model.getIpsrsKalibrasi().noRec); + IpsrsKalibrasi ipsrsKalibrasi = em.find(IpsrsKalibrasi.class, model.getIpsrsKalibrasi().getNoRec()); em.remove(em.contains(ipsrsKalibrasi) ? ipsrsKalibrasi : em.merge(ipsrsKalibrasi)); }catch (Exception ex){ ex.printStackTrace(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdmisiRencanaPindahRuanganServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdmisiRencanaPindahRuanganServiceImpl.java index 4df4817a..259966b7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdmisiRencanaPindahRuanganServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdmisiRencanaPindahRuanganServiceImpl.java @@ -1,40 +1,16 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.AdmisiRencanaPindahRuanganDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.AdmisiRencanaPindahRuanganService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.AdmisiRencanaPindahRuanganDao; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.KamarDao; -import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao; -import com.jasamedika.medifirst2000.dao.TempatTidurDao; -import com.jasamedika.medifirst2000.dao.custom.AdmisiRencanaPindahRuanganDaoCustom; -import com.jasamedika.medifirst2000.entities.AdmisiRencanaPindahRuangan; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.Kamar; -import com.jasamedika.medifirst2000.entities.Kelas; -import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StatusBed; -import com.jasamedika.medifirst2000.entities.StatusKeluar; -import com.jasamedika.medifirst2000.entities.TempatTidur; -import com.jasamedika.medifirst2000.service.AdmisiRencanaPindahRuanganService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO; -import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.KamarVO; -import com.jasamedika.medifirst2000.vo.KelasVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananPasienVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StatusKeluarVO; +import java.util.*; @Service("admisiRencanaPindahRuanganService") public class AdmisiRencanaPindahRuanganServiceImpl implements AdmisiRencanaPindahRuanganService{ @@ -112,7 +88,7 @@ public class AdmisiRencanaPindahRuanganServiceImpl implements AdmisiRencanaPinda //---------------------------------------------------- if(CommonUtil.isNotNullOrEmpty(admisiRencanaPindahRuangan)){ AdmisiRencanaPindahRuangan paketKunjunganPasienResult = admisiRencanaPindahRuanganDao.save(admisiRencanaPindahRuangan); - result.put("noRec", paketKunjunganPasienResult.noRec); + result.put("noRec", paketKunjunganPasienResult.getNoRec()); } return result; @@ -218,9 +194,9 @@ public class AdmisiRencanaPindahRuanganServiceImpl implements AdmisiRencanaPinda AdmisiRencanaPindahRuangan paketKunjunganPasienResult = admisiRencanaPindahRuanganDao.save(admisiRencanaPindahRuangan); AntrianPasienDiPeriksa newAntrianPasienDiPeriksa = antrianPasienDiPeriksaDao.save(antrianPasienDiperiksa); AntrianPasienDiPeriksa lastAntrianPasienDiPeriksa = antrianPasienDiPeriksaDao.save(antrianPasienDiperiksaBefore); - result.put("noRec", paketKunjunganPasienResult.noRec); - result.put("noRecAntrianLama", lastAntrianPasienDiPeriksa.noRec); - result.put("noRecAntrianBaru", newAntrianPasienDiPeriksa.noRec); + result.put("noRec", paketKunjunganPasienResult.getNoRec()); + result.put("noRecAntrianLama", lastAntrianPasienDiPeriksa.getNoRec()); + result.put("noRecAntrianBaru", newAntrianPasienDiPeriksa.getNoRec()); } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnggaranServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnggaranServiceImpl.java index cc50e1db..f2a28992 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnggaranServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnggaranServiceImpl.java @@ -296,7 +296,7 @@ public class AnggaranServiceImpl extends BaseAngaranServiceImpl implements Angga if (CommonUtil.isNotNullOrEmpty(headAnggaran)) { HeadAnggaran resultHeadAnggaran = anggaranDAo.save(headAnggaran); - result.put("noRec", resultHeadAnggaran.noRec); + result.put("noRec", resultHeadAnggaran.getNoRec()); } return result; @@ -756,7 +756,7 @@ public class AnggaranServiceImpl extends BaseAngaranServiceImpl implements Angga if (CommonUtil.isNotNullOrEmpty(headAnggaran)) { HeadAnggaran resultHeadAnggaran = anggaranDAo.save(headAnggaran); - result.put("noRec", resultHeadAnggaran.noRec); + result.put("noRec", resultHeadAnggaran.getNoRec()); } } System.out.println("=======END SAVE EDIT PENGAJUAN USULAN ANGGARAN======="); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/B3RuanganInputDataServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/B3RuanganInputDataServiceImpl.java index bd5965de..b428d597 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/B3RuanganInputDataServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/B3RuanganInputDataServiceImpl.java @@ -1,31 +1,18 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.B3RuanganInputDataDao; import com.jasamedika.medifirst2000.dao.JenisLimbahB3MasukDao; import com.jasamedika.medifirst2000.dao.custom.B3RuanganInputDataDaoCustom; -import com.jasamedika.medifirst2000.entities.B3DaftarBahanBerbahaya; -import com.jasamedika.medifirst2000.entities.B3RuanganInputData; -import com.jasamedika.medifirst2000.entities.JenisLimbahB3Masuk; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StokProdukGlobal; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.B3RuanganInputDataService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.B3DaftarBahanBerbahayaVO; -import com.jasamedika.medifirst2000.vo.B3RuanganInputDataVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("b3RuanganInputDataService") public class B3RuanganInputDataServiceImpl implements B3RuanganInputDataService { @@ -126,7 +113,7 @@ public class B3RuanganInputDataServiceImpl implements B3RuanganInputDataService } if(CommonUtil.isNotNullOrEmpty(b3RuanganInputData)){ B3RuanganInputData b3RuanganInputDataResult = b3RuanganInputDataDao.save(b3RuanganInputData); - result.put("noRec", b3RuanganInputDataResult.noRec); + result.put("noRec", b3RuanganInputDataResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java index 1066369d..a10ff3e4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java @@ -75,7 +75,7 @@ public class DaftarStrukPenjualanServiceImpl implements DaftarStrukPenjualanServ } if (CommonUtil.isNotNullOrEmpty(strukPelayanan)) { StrukPelayanan strukPelayananResult = strukPelayananDao.save(strukPelayanan); - result.put("noRec", strukPelayananResult.noRec); + result.put("noRec", strukPelayananResult.getNoRec()); } } return result; @@ -137,7 +137,7 @@ public class DaftarStrukPenjualanServiceImpl implements DaftarStrukPenjualanServ PelayananPasien pelayananPasienResult = pelayananPasienDao.save(pelayananPasien); if (CommonUtil.isNotNullOrEmpty(pelayananPasienResult)) { Map mapResult = new HashMap<>(); - mapResult.put("noRec", pelayananPasienResult.noRec); + mapResult.put("noRec", pelayananPasienResult.getNoRec()); } } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DataPesertaPerusahanYangBekerjaSamaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DataPesertaPerusahanYangBekerjaSamaServiceImpl.java index 8be7a1d8..7f14f224 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DataPesertaPerusahanYangBekerjaSamaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DataPesertaPerusahanYangBekerjaSamaServiceImpl.java @@ -1,13 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.DataPesertaPerusahanYangBekerjaSamaDao; import com.jasamedika.medifirst2000.entities.DataPerusahaanYangBekerjaSama; @@ -18,6 +10,13 @@ import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.DataPerusahaanYangBekerjaSamaVO; import com.jasamedika.medifirst2000.vo.DataPesertaPerusahanYangBekerjaSamaVO; import com.jasamedika.medifirst2000.vo.JenisKelaminVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("DataPesertaPerusahanYangBekerjaSamaService") public class DataPesertaPerusahanYangBekerjaSamaServiceImpl implements DataPesertaPerusahanYangBekerjaSamaService { @@ -56,7 +55,7 @@ public class DataPesertaPerusahanYangBekerjaSamaServiceImpl implements DataPeser result.put("plafonYangDijamin", resultModel.getPlafonYangDijamin()); result.put("alamat", resultModel.getAlamat()); result.put("noTlp", resultModel.getNoTlp()); - result.put("statusEnabled", resultModel.statusEnabled); + result.put("statusEnabled", resultModel.getStatusEnabled()); result.put("noRec", resultModel.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java index 3645edb6..af600177 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java @@ -1,31 +1,8 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.DiagnosaPasienDao; -import com.jasamedika.medifirst2000.dao.MapDiagnosisToProdukDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienDao; -import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao; -import com.jasamedika.medifirst2000.dao.PostingJurnalTransaksiDao; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien; -import com.jasamedika.medifirst2000.entities.Diagnosa; -import com.jasamedika.medifirst2000.entities.DiagnosaPasien; -import com.jasamedika.medifirst2000.entities.JenisDiagnosa; -import com.jasamedika.medifirst2000.entities.MapDiagnosaToProduk; -import com.jasamedika.medifirst2000.entities.PelayananPasien; -import com.jasamedika.medifirst2000.entities.Produk; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.enums.StatusAntrianEnum; import com.jasamedika.medifirst2000.enums.StatusPenyakitEnum; import com.jasamedika.medifirst2000.service.DiagnosaPasienService; @@ -36,12 +13,17 @@ import com.jasamedika.medifirst2000.vo.DetailDiagnosaPasienVO; import com.jasamedika.medifirst2000.vo.DiagnosaPasienVO; import com.jasamedika.medifirst2000.vo.DiagnosaVO; import com.jasamedika.medifirst2000.vo.JenisDiagnosaVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; /** * Implement class for PreskripsiDietService * * @author Adik - * @param + * */ @Service("diagnosaPasienService") @@ -141,7 +123,7 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag } if(CommonUtil.isNotNullOrEmpty(diagnosaPasien)) { DiagnosaPasien resultPasien = diagnosaPasienDao.save(diagnosaPasien); - result.put("noRec", resultPasien.noRec); + result.put("noRec", resultPasien.getNoRec()); result.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien()); result.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm()); } @@ -221,7 +203,7 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag } if (CommonUtil.isNotNullOrEmpty(diagnosaPasien)) { DiagnosaPasien resultPasien = diagnosaPasienDao.save(diagnosaPasien); - result.put("noRec", resultPasien.noRec); + result.put("noRec", resultPasien.getNoRec()); result.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien()); result.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm()); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HVAServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HVAServiceImpl.java index 254e8409..964cb083 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HVAServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HVAServiceImpl.java @@ -1,14 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.HVADao; import com.jasamedika.medifirst2000.entities.DetailHVA; @@ -19,6 +10,11 @@ import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.DetailHVAVO; import com.jasamedika.medifirst2000.vo.HVAVO; import com.jasamedika.medifirst2000.vo.JenisHVAVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.*; @Service("HVAService") public class HVAServiceImpl implements HVAService{ @@ -82,7 +78,7 @@ public class HVAServiceImpl implements HVAService{ } if(CommonUtil.isNotNullOrEmpty(hva)){ HVA hvaResult = hvaDao.save(hva); - result.put("noRec", hvaResult.noRec); + result.put("noRec", hvaResult.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HistoriPelayananCsServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HistoriPelayananCsServiceImpl.java index e7d69c8e..9adb9595 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HistoriPelayananCsServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HistoriPelayananCsServiceImpl.java @@ -1,47 +1,21 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.HistoriPelayananCsDao; +import com.jasamedika.medifirst2000.dao.StrukHistoriDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.HistoriPelayananCsService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.HistoriPelayananCsDao; -import com.jasamedika.medifirst2000.dao.StrukHistoriDao; -import com.jasamedika.medifirst2000.entities.Alamat; -import com.jasamedika.medifirst2000.entities.HistoriPelayananCs; -import com.jasamedika.medifirst2000.entities.JenisKelamin; -import com.jasamedika.medifirst2000.entities.JenisRespon; -import com.jasamedika.medifirst2000.entities.KelompokProduk; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.Komunikasi; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PlanningPegawaiMuSaRe; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StrukHistori; -import com.jasamedika.medifirst2000.entities.StrukPlanning; -import com.jasamedika.medifirst2000.service.HistoriPelayananCsService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.vo.AlamatVO; -import com.jasamedika.medifirst2000.vo.HistoriPelayananCsVO; -import com.jasamedika.medifirst2000.vo.JenisKelaminVO; -import com.jasamedika.medifirst2000.vo.JenisResponVO; -import com.jasamedika.medifirst2000.vo.KelompokProdukVO; -import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO; -import com.jasamedika.medifirst2000.vo.KomunikasiVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; -import com.jasamedika.medifirst2000.vo.StrukPlanningVO; - @Service("HistoriPelayananCsService") public class HistoriPelayananCsServiceImpl implements HistoriPelayananCsService { @@ -132,7 +106,7 @@ public class HistoriPelayananCsServiceImpl implements HistoriPelayananCsService if(CommonUtil.isNotNullOrEmpty(strukHistori)){ StrukHistori strukHistoriResult = strukHistoriDao.save(strukHistori); - result.put("noRecStrukHistori", strukHistoriResult.noRec); + result.put("noRecStrukHistori", strukHistoriResult.getNoRec()); } return result; } @@ -189,7 +163,7 @@ public class HistoriPelayananCsServiceImpl implements HistoriPelayananCsService if(CommonUtil.isNotNullOrEmpty(historiPelayananCs)) { HistoriPelayananCs historiPelayananCsStatusResult = historiPelayananCsDao.save(historiPelayananCs); - result.put("NoRec", historiPelayananCsStatusResult.noRec); + result.put("NoRec", historiPelayananCsStatusResult.getNoRec()); /* * save StrukHistori here @@ -222,7 +196,7 @@ public class HistoriPelayananCsServiceImpl implements HistoriPelayananCsService if(CommonUtil.isNotNullOrEmpty(strukHistori)){ StrukHistori strukHistoriResult = strukHistoriDao.save(strukHistori); - result.put("norecstruk", strukHistoriResult.noRec); + result.put("norecstruk", strukHistoriResult.getNoRec()); //saveStrukHistori(strukHistoriVO); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java index 5bfd5338..e3a74a4b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java @@ -287,7 +287,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik strukPelayanan.setTotalharusdibayar(ikiDanRemunerasi.getRemunerasi()); if (CommonUtil.isNotNullOrEmpty(strukPelayanan)) { StrukPelayanan modelStrukPelayanan = strukPelayananDao.save(strukPelayanan); - result.put("noRec StrukPelayanan-" + modelStrukPelayanan.noRec, modelStrukPelayanan.noRec); + result.put("noRec StrukPelayanan-" + modelStrukPelayanan.getNoRec(), modelStrukPelayanan.getNoRec()); noRecStrukPelayanan = modelStrukPelayanan.getNoRec(); } if (CommonUtil.isNotNullOrEmpty(noRecStrukPelayanan)) { @@ -311,7 +311,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik strukHistori.setIkiDanRemunerasi(listIkiDanRemunerasi); if (CommonUtil.isNotNullOrEmpty(strukHistori)) { StrukHistori model = strukHistoriDao.save(strukHistori); - result.put("noRecStrukHistori" + "", model.noRec); + result.put("noRecStrukHistori" + "", model.getNoRec()); } } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java index 2abc0d7b..ded3eede 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java @@ -755,7 +755,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK nilaiIndexKinerjaIndividu.setPegawai(pegawai); if (CommonUtil.isNotNullOrEmpty(nilaiIndexKinerjaIndividu)) { NilaiIndexKinerjaIndividu model = nilaiIndexKinerjaIndividuDao.save(nilaiIndexKinerjaIndividu); - result.put(model.getPeriode(), model.noRec); + result.put(model.getPeriode(), model.getNoRec()); } } return result; @@ -778,13 +778,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Map nilaiIKI = indekKinerjaDao.findNilaiIndeksKinerja(pegawai.getId(), periode); if (CommonUtil.isNotNullOrEmpty(indekKinerjaIndividu)) { IndeksKinerjaIndividu model = indeksKinerjaIndividuDao.save(indekKinerjaIndividu); - result.put(model.getPeriode(), model.noRec); + result.put(model.getPeriode(), model.getNoRec()); if (CommonUtil.isNotNullOrEmpty(model)) { if (CommonUtil.isNotNullOrEmpty(nilaiIKI)) { String noRec = (String) nilaiIKI.get("noRec"); nilaiIndexKinerjaIndividu.setNoRec(noRec); NilaiIndexKinerjaIndividu modell = nilaiIndexKinerjaIndividuDao.save(nilaiIndexKinerjaIndividu); - result.put(modell.getPeriode(), modell.noRec); + result.put(modell.getPeriode(), modell.getNoRec()); } } nilaiIndexKinerjaIndividu.setPegawai(pegawai); @@ -820,7 +820,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK .transferVOToModel(temp.getNilaiIndexKinerjaIndividu(), new NilaiIndexKinerjaIndividu()); if (CommonUtil.isNotNullOrEmpty(indekKinerjaIndividu)) { IndeksKinerjaIndividu model = indeksKinerjaIndividuDao.save(indekKinerjaIndividu); - result.put(model.getPeriode(), model.noRec); + result.put(model.getPeriode(), model.getNoRec()); state++; } nilaiIndexKinerjaIndividu.setPegawai(pegawai); @@ -834,7 +834,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK if (state == vo.getIndeksKinerjaIndividu().size()) { if (CommonUtil.isNotNullOrEmpty(nilaiIndexKinerjaIndividu)) { NilaiIndexKinerjaIndividu model = nilaiIndexKinerjaIndividuDao.save(nilaiIndexKinerjaIndividu); - result.put(model.getPeriode(), model.noRec); + result.put(model.getPeriode(), model.getNoRec()); } } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsMaintenanceServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsMaintenanceServiceImpl.java index f8b3e981..f93191bf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsMaintenanceServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsMaintenanceServiceImpl.java @@ -1,47 +1,20 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsMaintenanceDao; import com.jasamedika.medifirst2000.dao.IpsrsPerbaikanDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.dao.custom.IpsrsMaintenanceDaoCustom; -import com.jasamedika.medifirst2000.entities.IpsrsKalibrasi; -import com.jasamedika.medifirst2000.entities.IpsrsKontakService; -import com.jasamedika.medifirst2000.entities.IpsrsMaintenance; -import com.jasamedika.medifirst2000.entities.IpsrsTeknisiKalibrasi; -import com.jasamedika.medifirst2000.entities.IpsrsTeknisiKontakService; -import com.jasamedika.medifirst2000.entities.IpsrsTeknisiPemeliharaan; -import com.jasamedika.medifirst2000.entities.IpsrsPemeliharaan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.RegistrasiAset; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.IpsrsMaintenanceService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.IpsrsKalibrasiVO; -import com.jasamedika.medifirst2000.vo.IpsrsKontakServiceVO; -import com.jasamedika.medifirst2000.vo.IpsrsTeknisiKalibrasiVO; -import com.jasamedika.medifirst2000.vo.IpsrsTeknisiKontakServiceVO; -import com.jasamedika.medifirst2000.vo.IpsrsTeknisiPemeliharaanVO; -import com.jasamedika.medifirst2000.vo.IpsrsMaintenanceVO; -import com.jasamedika.medifirst2000.vo.IpsrsPemeliharaanVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; -import com.jasamedika.medifirst2000.vo.RekananVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Service("ipsrsMaintenanceService") public class IpsrsMaintenanceServiceImpl implements IpsrsMaintenanceService{ @@ -297,7 +270,7 @@ public class IpsrsMaintenanceServiceImpl implements IpsrsMaintenanceService{ } if(CommonUtil.isNotNullOrEmpty(ipsrsMaintenance)){ IpsrsMaintenance ipsrsMaintenanceResult = ipsrsMaintenanceDao.save(ipsrsMaintenance); - result.put("noRec", ipsrsMaintenanceResult.noRec); + result.put("noRec", ipsrsMaintenanceResult.getNoRec()); } return result; } @@ -460,7 +433,7 @@ public class IpsrsMaintenanceServiceImpl implements IpsrsMaintenanceService{ } if(CommonUtil.isNotNullOrEmpty(ipsrsMaintenance)){ IpsrsMaintenance ipsrsMaintenanceResult = ipsrsMaintenanceDao.save(ipsrsMaintenance); - result.put("noRec", ipsrsMaintenanceResult.noRec); + result.put("noRec", ipsrsMaintenanceResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianMesinServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianMesinServiceImpl.java index 9da64831..5da8a087 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianMesinServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianMesinServiceImpl.java @@ -1,28 +1,20 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsPemakaianMesinDao; import com.jasamedika.medifirst2000.dao.MesinDao; import com.jasamedika.medifirst2000.dao.custom.IpsrsPemakaianMesinDaoCustom; -import com.jasamedika.medifirst2000.entities.IpsrsMesinBoiler; -import com.jasamedika.medifirst2000.entities.IpsrsMesinGenset; -import com.jasamedika.medifirst2000.entities.IpsrsPemakaianMesin; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Produk; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.IpsrsPemakaianMesinService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.IpsrsMesinBoilerVO; -import com.jasamedika.medifirst2000.vo.IpsrsMesinGensetVO; -import com.jasamedika.medifirst2000.vo.IpsrsPemakaianMesinVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("ipsrsPemakaianMesinService") public class IpsrsPemakaianMesinServiceImpl implements IpsrsPemakaianMesinService{ @@ -130,7 +122,7 @@ public class IpsrsPemakaianMesinServiceImpl implements IpsrsPemakaianMesinServic } if(CommonUtil.isNotNullOrEmpty(ipsrsPemakaianMesin)){ IpsrsPemakaianMesin ipsrsPemakaianMesinResult = ipsrsPemakaianBoilerDao.save(ipsrsPemakaianMesin); - result.put("noRec", ipsrsPemakaianMesinResult.noRec); + result.put("noRec", ipsrsPemakaianMesinResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianRuanganServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianRuanganServiceImpl.java index eb742388..3ebac8b8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianRuanganServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPemakaianRuanganServiceImpl.java @@ -1,24 +1,20 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsPemakaianRuanganDao; import com.jasamedika.medifirst2000.dao.custom.IpsrsPemakaianRuanganDaoCustom; -import com.jasamedika.medifirst2000.entities.IpsrsPemakaianRuangan; import com.jasamedika.medifirst2000.entities.IpsrsKapasitasJenisPemakaian; +import com.jasamedika.medifirst2000.entities.IpsrsPemakaianRuangan; import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.service.IpsrsPemakaianRuanganService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.IpsrsPemakaianRuanganVO; import com.jasamedika.medifirst2000.vo.IpsrsKapasitasJenisPemakaianVO; +import com.jasamedika.medifirst2000.vo.IpsrsPemakaianRuanganVO; import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("ipsrsPemakaianRuanganService") public class IpsrsPemakaianRuanganServiceImpl implements IpsrsPemakaianRuanganService{ @@ -78,7 +74,7 @@ public class IpsrsPemakaianRuanganServiceImpl implements IpsrsPemakaianRuanganSe } if(CommonUtil.isNotNullOrEmpty(ipsrsPemakaianRuangan)){ IpsrsPemakaianRuangan ipsrsPemakaianRuanganResult = ipsrsPemakaianRuanganDao.save(ipsrsPemakaianRuangan); - result.put("noRec", ipsrsPemakaianRuanganResult.noRec); + result.put("noRec", ipsrsPemakaianRuanganResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPeminjamanAlatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPeminjamanAlatServiceImpl.java index 2829c258..349c7baf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPeminjamanAlatServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPeminjamanAlatServiceImpl.java @@ -1,34 +1,24 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsMaintenanceDao; import com.jasamedika.medifirst2000.dao.IpsrsPeminjamanAlatDao; import com.jasamedika.medifirst2000.dao.IpsrsPerbaikanDao; import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.dao.custom.IpsrsPeminjamanAlatDaoCustom; -import com.jasamedika.medifirst2000.entities.IpsrsPeminjamanAlat; -import com.jasamedika.medifirst2000.entities.IpsrsTagihanBusinessCenter; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.RegistrasiAset; -import com.jasamedika.medifirst2000.entities.Ruangan; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.IpsrsPeminjamanAlatService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.IpsrsPeminjamanAlatVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("ipsrsPeminjamanAlatService") public class IpsrsPeminjamanAlatServiceImpl extends BaseAngaranServiceImpl implements IpsrsPeminjamanAlatService{ @@ -162,7 +152,7 @@ public class IpsrsPeminjamanAlatServiceImpl extends BaseAngaranServiceImpl imple ipsrsPeminjamanAlat.setRuanganAsal(getRuanganByUserLogin()); if(CommonUtil.isNotNullOrEmpty(ipsrsPeminjamanAlat)){ IpsrsPeminjamanAlat resultPeminjamanAlat = ipsrsPeminjamanAlatDao.save(ipsrsPeminjamanAlat); - result.put("noRec", resultPeminjamanAlat.noRec); + result.put("noRec", resultPeminjamanAlat.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java index 70f8f6e3..42a752da 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java @@ -1,45 +1,17 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.IpsrsPelaksanaanPerbaikanDao; -import com.jasamedika.medifirst2000.dao.IpsrsPerbaikanDao; -import com.jasamedika.medifirst2000.dao.IpsrsStatusPerbaikanDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikan; -import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikanListTeknisi; -import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikanSukuCadang; -import com.jasamedika.medifirst2000.entities.IpsrsPerbaikan; -import com.jasamedika.medifirst2000.entities.IpsrsStatusPerbaikan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.RegistrasiAset; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StokProdukGlobal; -import com.jasamedika.medifirst2000.entities.StrukOrder; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.IpsrsPerbaikanService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.IpsrsPelaksanaanPerbaikanListTeknisiVO; -import com.jasamedika.medifirst2000.vo.IpsrsPelaksanaanPerbaikanSukuCadangVO; -import com.jasamedika.medifirst2000.vo.IpsrsPelaksanaanPerbaikanVO; -import com.jasamedika.medifirst2000.vo.IpsrsPerbaikanVO; -import com.jasamedika.medifirst2000.vo.IpsrsStatusPerbaikanVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("ipsrsPerbaikanService") public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService { @@ -492,7 +464,7 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService { } if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) { IpsrsPerbaikan resultIpsrsPerbaikan = ipsrsPerbaikanDao.save(ipsrsPerbaikan); - result.put("noRec", resultIpsrsPerbaikan.noRec); + result.put("noRec", resultIpsrsPerbaikan.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPreventiveMaintenanceServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPreventiveMaintenanceServiceImpl.java index aa221acd..2b823143 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPreventiveMaintenanceServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPreventiveMaintenanceServiceImpl.java @@ -1,37 +1,18 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsPreventiveMaintenanceDao; -import com.jasamedika.medifirst2000.entities.IpsrsPemeriksaanAlat; -import com.jasamedika.medifirst2000.entities.IpsrsPemeriksaan; -import com.jasamedika.medifirst2000.entities.IpsrsPreventiveMaintenance; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PengecekanPeralatanMapping; -import com.jasamedika.medifirst2000.entities.RegistrasiAset; -import com.jasamedika.medifirst2000.entities.Rekanan; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.IpsrsMaintenanceService; import com.jasamedika.medifirst2000.service.IpsrsPreventiveMaintenanceService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.IpsrsPemeriksaanAlatVO; -import com.jasamedika.medifirst2000.vo.IpsrsPemeriksaanVO; -import com.jasamedika.medifirst2000.vo.IpsrsPreventiveMaintenanceVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PengecekanPeralatanMappingVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; -import com.jasamedika.medifirst2000.vo.RekananVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("ipsrsPreventiveMaintenanceService") public class IpsrsPreventiveMaintenanceServiceImpl implements IpsrsPreventiveMaintenanceService{ @@ -220,7 +201,7 @@ public class IpsrsPreventiveMaintenanceServiceImpl implements IpsrsPreventiveMai } } - result.put("noRec", IpsrsPreventiveMaintenanceResult.noRec); + result.put("noRec", IpsrsPreventiveMaintenanceResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsTagihanBusinessCenterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsTagihanBusinessCenterServiceImpl.java index 37db8920..ed15ba57 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsTagihanBusinessCenterServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsTagihanBusinessCenterServiceImpl.java @@ -1,22 +1,21 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsTagihanBusinessCenterDao; import com.jasamedika.medifirst2000.entities.IpsrsKapasitasJenisPemakaian; import com.jasamedika.medifirst2000.entities.IpsrsTagihanBusinessCenter; import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.service.IpsrsTagihanBusinessCenterService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.IpsrsKapasitasJenisPemakaianVO; import com.jasamedika.medifirst2000.vo.IpsrsTagihanBusinessCenterVO; import com.jasamedika.medifirst2000.vo.RekananVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("ipsrsTagihanBusinessCenterService") public class IpsrsTagihanBusinessCenterServiceImpl implements IpsrsTagihanBusinessCenterService{ @@ -73,7 +72,7 @@ public class IpsrsTagihanBusinessCenterServiceImpl implements IpsrsTagihanBusine } if(CommonUtil.isNotNullOrEmpty(ipsrsTagihanBusinessCenter)){ IpsrsTagihanBusinessCenter ipsrsTagihanBusinessCenterResult = ipsrsTagihanBusinessCenterDao.save(ipsrsTagihanBusinessCenter); - result.put("noRec", ipsrsTagihanBusinessCenterResult.noRec); + result.put("noRec", ipsrsTagihanBusinessCenterResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java index 0876bbf4..5678f2ee 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java @@ -1,48 +1,18 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.ItPelaksanaanPerbaikanDao; -import com.jasamedika.medifirst2000.dao.ItPelaksanaanPerbaikanListTeknisiDao; -import com.jasamedika.medifirst2000.dao.ItPelaksanaanPerbaikanSukuCadangDao; -import com.jasamedika.medifirst2000.dao.ItPerbaikanDao; -import com.jasamedika.medifirst2000.dao.ItStatusPerbaikanDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.StokProdukGlobalDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; +import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dao.custom.ItPerbaikanDaoCustom; -import com.jasamedika.medifirst2000.entities.ItPelaksanaanPerbaikan; -import com.jasamedika.medifirst2000.entities.ItPelaksanaanPerbaikanListTeknisi; -import com.jasamedika.medifirst2000.entities.ItPelaksanaanPerbaikanSukuCadang; -import com.jasamedika.medifirst2000.entities.ItPerbaikan; -import com.jasamedika.medifirst2000.entities.ItStatusPerbaikan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.RegistrasiAset; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StokProdukGlobal; -import com.jasamedika.medifirst2000.entities.StrukOrder; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.ItPerbaikanService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.ItPelaksanaanPerbaikanListTeknisiVO; -import com.jasamedika.medifirst2000.vo.ItPelaksanaanPerbaikanSukuCadangVO; -import com.jasamedika.medifirst2000.vo.ItPelaksanaanPerbaikanVO; -import com.jasamedika.medifirst2000.vo.ItPerbaikanVO; -import com.jasamedika.medifirst2000.vo.ItStatusPerbaikanVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("ItPerbaikanService") public class ItPerbaikanServiceImpl implements ItPerbaikanService { @@ -543,7 +513,7 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService { } if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) { ItPerbaikan resultItPerbaikan = itPerbaikanDao.save(ItPerbaikan); - result.put("noRec", resultItPerbaikan.noRec); + result.put("noRec", resultItPerbaikan.getNoRec()); } return result; } @@ -744,7 +714,7 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService { long inMinute = dateTime / 60000; ItStatusPerbaikan.setStatusRespon(1); ItStatusPerbaikan.setKetStatusRespon("Sudah di Respon"); - result.put("noRec", ItPerbaikan.noRec); + result.put("noRec", ItPerbaikan.getNoRec()); if (inMinute < 15) { ItStatusPerbaikan.setStatusRespon(1); ItStatusPerbaikan.setWaktuRespon(inMinute); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3CheckListFacillitySefetyServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3CheckListFacillitySefetyServiceImpl.java index 0d966dc7..e51dc8ab 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3CheckListFacillitySefetyServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3CheckListFacillitySefetyServiceImpl.java @@ -1,15 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.K3CheckListFacillitySefetyDao; import com.jasamedika.medifirst2000.entities.K3CheckListFacillitySefety; @@ -22,6 +12,10 @@ import com.jasamedika.medifirst2000.vo.K3CheckListFacillitySefetyDetailVO; import com.jasamedika.medifirst2000.vo.K3CheckListFacillitySefetyVO; import com.jasamedika.medifirst2000.vo.K3ItemPeriksaGedungVO; import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("k3CheckListFacillitySefetyService") public class K3CheckListFacillitySefetyServiceImpl implements K3CheckListFacillitySefetyService{ @@ -112,7 +106,7 @@ public class K3CheckListFacillitySefetyServiceImpl implements K3CheckListFacilli } if(CommonUtil.isNotNullOrEmpty(k3CheckListFacillitySefety)){ K3CheckListFacillitySefety k3CheckListFacillitySefetyResult = k3CheckListFacillitySefetyDao.save(k3CheckListFacillitySefety); - result.put("noRec", k3CheckListFacillitySefetyResult.noRec); + result.put("noRec", k3CheckListFacillitySefetyResult.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3LaporanKecelakaanKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3LaporanKecelakaanKerjaServiceImpl.java index 73234a7d..f54fe139 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3LaporanKecelakaanKerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/K3LaporanKecelakaanKerjaServiceImpl.java @@ -1,42 +1,18 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.K3LaporanKecelakaanKerjaDao; import com.jasamedika.medifirst2000.dao.LkkIdentifikasiKorbanDao; import com.jasamedika.medifirst2000.dao.custom.K3LaporanKecelakaanKerjaDaoCustom; -import com.jasamedika.medifirst2000.entities.K3LaporanKecelakaanKerja; -import com.jasamedika.medifirst2000.entities.LkkPerkiraanKerugian; -import com.jasamedika.medifirst2000.entities.LkkIdentifikasiKejadian; -import com.jasamedika.medifirst2000.entities.LkkIdentifikasiKorban; -import com.jasamedika.medifirst2000.entities.LkkRencanaTindakLanjut; -import com.jasamedika.medifirst2000.entities.LkkSaksiKejadian; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StatusYaTidak; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.K3LaporanKecelakaanKerjaService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.K3LaporanKecelakaanKerjaVO; -import com.jasamedika.medifirst2000.vo.LkkPerkiraanKerugianVO; -import com.jasamedika.medifirst2000.vo.LkkIdentifikasiKejadianVO; -import com.jasamedika.medifirst2000.vo.LkkIdentifikasiKorbanVO; -import com.jasamedika.medifirst2000.vo.LkkRencanaTindakLanjutVO; -import com.jasamedika.medifirst2000.vo.LkkSaksiKejadianVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StatusYaTidakVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("k3LaporanKecelakaanKerjaService") public class K3LaporanKecelakaanKerjaServiceImpl implements K3LaporanKecelakaanKerjaService{ @@ -189,7 +165,7 @@ public class K3LaporanKecelakaanKerjaServiceImpl implements K3LaporanKecelakaanK if(CommonUtil.isNotNullOrEmpty(k3LaporanKecelakaanKerja)){ K3LaporanKecelakaanKerja k3LaporanKecelakaanKerjaResult = k3LaporanKecelakaanKerjaDao.save(k3LaporanKecelakaanKerja); - result.put("noRec", k3LaporanKecelakaanKerjaResult.noRec); + result.put("noRec", k3LaporanKecelakaanKerjaResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KartuPengendaliServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KartuPengendaliServiceImpl.java index 5af3ea1d..0dd4fdc6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KartuPengendaliServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KartuPengendaliServiceImpl.java @@ -1,31 +1,21 @@ package com.jasamedika.medifirst2000.service.impl; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.UUID; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.KartuPengendaliDaoCustom; +import com.jasamedika.medifirst2000.dao.custom.StrukPelayananDetailDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.enums.VerifikasiEnum; +import com.jasamedika.medifirst2000.service.KartuPengendaliService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.util.IndonesianNumberToWords; +import com.jasamedika.medifirst2000.vo.*; import org.apache.commons.codec.binary.Base64; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -34,55 +24,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.DetailPengadaanDao; -import com.jasamedika.medifirst2000.dao.DetailSpekAnggaranDao; -import com.jasamedika.medifirst2000.dao.KartuPengendaliDao; -import com.jasamedika.medifirst2000.dao.KartuPengendaliDetailDao; -import com.jasamedika.medifirst2000.dao.MapKartuPengendaliToMetodeSubDetailDao; -import com.jasamedika.medifirst2000.dao.MetodePengadaanDetailDao; -import com.jasamedika.medifirst2000.dao.MetodePengadaanSubDetailDao; -import com.jasamedika.medifirst2000.dao.PenawaranHargaDao; -import com.jasamedika.medifirst2000.dao.PenawaranHargaSupplierDao; -import com.jasamedika.medifirst2000.dao.PengadaanDao; -import com.jasamedika.medifirst2000.dao.RekananDao; -import com.jasamedika.medifirst2000.dao.StrukRekapPemenangDao; -import com.jasamedika.medifirst2000.dao.custom.KartuPengendaliDaoCustom; -import com.jasamedika.medifirst2000.dao.custom.StrukPelayananDetailDaoCustom; -import com.jasamedika.medifirst2000.entities.AsalProduk; -import com.jasamedika.medifirst2000.entities.DetailPengadaan; -import com.jasamedika.medifirst2000.entities.DetailRup; -import com.jasamedika.medifirst2000.entities.DetailSpekAnggaran; -import com.jasamedika.medifirst2000.entities.KartuPengendali; -import com.jasamedika.medifirst2000.entities.KartuPengendaliDetail; -import com.jasamedika.medifirst2000.entities.KelompokUser; -import com.jasamedika.medifirst2000.entities.MapKartuPengendaliToMetodeSubDetail; -import com.jasamedika.medifirst2000.entities.MataAnggaran; -import com.jasamedika.medifirst2000.entities.MetodePengadaanSubDetail; -import com.jasamedika.medifirst2000.entities.PenawaranHarga; -import com.jasamedika.medifirst2000.entities.PenawaranHargaSupplier; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.StrukRekapPemenang; -import com.jasamedika.medifirst2000.enums.VerifikasiEnum; -import com.jasamedika.medifirst2000.service.KartuPengendaliService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.IndonesianNumberToWords; -import com.jasamedika.medifirst2000.vo.AsalProdukVO; -import com.jasamedika.medifirst2000.vo.DetailRupVO; -import com.jasamedika.medifirst2000.vo.KartuPengendaliCustomVO; -import com.jasamedika.medifirst2000.vo.KartuPengendaliDetailVO; -import com.jasamedika.medifirst2000.vo.KartuPengendaliVO; -import com.jasamedika.medifirst2000.vo.MapKartuPengendaliToMetodeSubDetailVO; -import com.jasamedika.medifirst2000.vo.MataAnggaranVO; -import com.jasamedika.medifirst2000.vo.PenawaranHargaSupplierVO; -import com.jasamedika.medifirst2000.vo.PenawaranHargaVO; -import com.jasamedika.medifirst2000.vo.RekananVO; -import com.jasamedika.medifirst2000.vo.RekapPemenangUlpVO; -import com.jasamedika.medifirst2000.vo.UpdateJadwalVO; -import com.jasamedika.medifirst2000.vo.UploadExcelVO; -import com.jasamedika.medifirst2000.vo.VerifikasiKartuPengendaliDetailVO; -import com.jasamedika.medifirst2000.vo.VerifikasiKartuPengendaliHeaderVO; +import java.io.*; +import java.util.*; @Service("kartuPengendaliService") public class KartuPengendaliServiceImpl extends BaseAngaranServiceImpl implements KartuPengendaliService{ @@ -210,7 +153,7 @@ public class KartuPengendaliServiceImpl extends BaseAngaranServiceImpl implement if(CommonUtil.isNotNullOrEmpty(kartuPengendali)){ KartuPengendali resultKartuPengendali = kartupengendaliDao.save(kartuPengendali); - result.put("noRec", resultKartuPengendali.noRec); + result.put("noRec", resultKartuPengendali.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java index 4dcc4c52..21e21667 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java @@ -2279,7 +2279,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr StrukPelayanan strukPelayananResult = this.strukPelayananDao.save(strukPelayanan); if(CommonUtil.isNotNullOrEmpty(strukPelayananResult.getNoRec())){ - result.put("noRec", strukPelayananResult.noRec); + result.put("noRec", strukPelayananResult.getNoRec()); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java index 071c8a48..f96bf8c9 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java @@ -672,7 +672,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon if (CommonUtil.isNotNullOrEmpty(monitoringAbsen)) { MonitoringAbsen model = monitoringAbsenDao.save(monitoringAbsen); - result.put(model.getNoRec(), model.noRec); + result.put(model.getNoRec(), model.getNoRec()); } try { @@ -2800,7 +2800,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon kelompokTransaksiConverter.transferVOToModel(vo.getKelompokTransaksi(), new KelompokTransaksi())); if (CommonUtil.isNotNullOrEmpty(strukHistori)) { StrukHistori model = strukHistoriDao.save(strukHistori); - result.put(model.getNoRec(), model.noRec); + result.put(model.getNoRec(), model.getNoRec()); } } return result; @@ -3060,7 +3060,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon if (CommonUtil.isNotNullOrEmpty(monitoringAbsen)) { MonitoringAbsen model = monitoringAbsenDao.save(monitoringAbsen); - result.put(model.getNoRec(), model.noRec); + result.put(model.getNoRec(), model.getNoRec()); } } @@ -3338,7 +3338,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon if (CommonUtil.isNotNullOrEmpty(monitoringAbsenDb)) { MonitoringAbsen model = monitoringAbsenDao.save(monitoringAbsenDb); - result.put(model.getNoRec(), model.noRec); + result.put(model.getNoRec(), model.getNoRec()); } } @@ -3557,7 +3557,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon StrukPelayananDetail strukPelayananDetail = getStrukPelayananDetail(uangLembur, pegawai, strukPelayanan); strukPelayananDetailDao.save(strukPelayananDetail); - return strukPelayananDetail.noRec; + return strukPelayananDetail.getNoRec(); } private static StrukPelayanan getStrukPelayanan(UangLemburVO uangLembur, Pegawai pegawai, diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPelayananSistemServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPelayananSistemServiceImpl.java index 638654c7..ae8e036a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPelayananSistemServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPelayananSistemServiceImpl.java @@ -1,32 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.OrderPelayananDao; +import com.jasamedika.medifirst2000.dao.StrukOrderDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.OrderPelayananSistemService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.OrderPelayananDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.entities.JenisDokumen; -import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.service.OrderPelayananSistemService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.JenisDokumenVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananSistemVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @@ -140,7 +130,7 @@ public class OrderPelayananSistemServiceImpl implements OrderPelayananSistemServ if (CommonUtil.isNotNullOrEmpty(op)) { OrderPelayanan opresult = this.orderPelayananDao.save(op); - result.put("norecOP", opresult.noRec); + result.put("norecOP", opresult.getNoRec()); } } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapCatatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapCatatanServiceImpl.java index 4a2aa4cc..1814c093 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapCatatanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapCatatanServiceImpl.java @@ -1,28 +1,23 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.converter.PapCatatanConverter; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.CatatanDao; import com.jasamedika.medifirst2000.dao.PapCatatanDao; import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; import com.jasamedika.medifirst2000.entities.Catatan; import com.jasamedika.medifirst2000.entities.PapCatatan; -import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapCatatanService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; import com.jasamedika.medifirst2000.vo.PapCatatanVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("PAPCatatanService") public class PapCatatanServiceImpl implements PapCatatanService { @@ -65,7 +60,7 @@ public class PapCatatanServiceImpl implements PapCatatanService { } if(CommonUtil.isNotNullOrEmpty(papCatatan)){ PapCatatan papCatatanResult = papCatatanDao.save(papCatatan); - result.put("noRec", papCatatanResult.noRec); + result.put("noRec", papCatatanResult.getNoRec()); } } }catch (Exception ex){ diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapGinekologiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapGinekologiServiceImpl.java index cd38cfff..46e5e4b1 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapGinekologiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapGinekologiServiceImpl.java @@ -1,36 +1,24 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.jasamedika.medifirst2000.converter.PapDataTandaVitalConverter; import com.jasamedika.medifirst2000.converter.PapGinekologiConverter; import com.jasamedika.medifirst2000.converter.PapLaboratoriumConverter; import com.jasamedika.medifirst2000.dao.PapGinekologiDao; import com.jasamedika.medifirst2000.dao.PasienDao; import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao; -import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan; -import com.jasamedika.medifirst2000.entities.PapLaboratorium; -import com.jasamedika.medifirst2000.entities.PapDataTandaVital; -import com.jasamedika.medifirst2000.entities.PapGinekologi; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapGinekologiService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.vo.PapKeluhanTambahanVO; -import com.jasamedika.medifirst2000.vo.PapLaboratoriumVO; import com.jasamedika.medifirst2000.vo.PapDataTandaVitalVO; import com.jasamedika.medifirst2000.vo.PapGinekologiVO; +import com.jasamedika.medifirst2000.vo.PapLaboratoriumVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; /** * Implement class for PAPGinekologiService @@ -76,7 +64,7 @@ public class PapGinekologiServiceImpl implements PapGinekologiService { model.setPasien(null); PapGinekologi resultModel=papGinekologiDao.save(model); if(CommonUtil.isNotNullOrEmpty(resultModel)){ - result.put("papGinekologi", resultModel.noRec); + result.put("papGinekologi", resultModel.getNoRec()); } return result; } @@ -103,7 +91,7 @@ public class PapGinekologiServiceImpl implements PapGinekologiService { model.getPapDataTandaVitalSet().addAll(detailPapDataTandaVital); PapGinekologi resultModel=papGinekologiDao.save(model); if(CommonUtil.isNotNullOrEmpty(resultModel)){ - result.put("papGinekologi", resultModel.noRec); + result.put("papGinekologi", resultModel.getNoRec()); result.put("dataFound", true); }else{ result.put("dataFound", false); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java index 18220749..f01a7b52 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java @@ -1,26 +1,17 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.service.PapInformasiIbuService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.Kebangsaan; -import com.jasamedika.medifirst2000.entities.PapInformasiIbu; -import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.KebangsaanVO; -import com.jasamedika.medifirst2000.vo.PapInformasiIbuVO; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.PapInformasiIbuDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.PapInformasiIbuService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; /** * Implement class for PapInformasiIbuService @@ -72,7 +63,7 @@ public class PapInformasiIbuServiceImpl extends BaseVoServiceImpl implements Pap } if(CommonUtil.isNotNullOrEmpty(model)){ PapInformasiIbu papInformasiIbuResult = papInformasiIbuDao.save(model); - result.put("noRec", papInformasiIbuResult.noRec); + result.put("noRec", papInformasiIbuResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatImunisasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatImunisasiServiceImpl.java index f21deedf..95bd0586 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatImunisasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatImunisasiServiceImpl.java @@ -1,17 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.PapImunisasiDetailConverter; import com.jasamedika.medifirst2000.converter.PapRiwayatImunisasiConverter; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; @@ -26,6 +14,11 @@ import com.jasamedika.medifirst2000.service.PapRiwayatImunisasiService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.PapImunisasiDetailVO; import com.jasamedika.medifirst2000.vo.PapRiwayatImunisasiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; + +import java.util.*; /** * Implement class for PAPRiwayatImunisasiService @@ -73,7 +66,7 @@ public class PapRiwayatImunisasiServiceImpl implements PapRiwayatImunisasiServic } if(CommonUtil.isNotNullOrEmpty(model)){ PapRiwayatImunisasi resultModel = papRiwayatImunisasiDao.save(model); - result.put("noRec", resultModel.noRec); + result.put("noRec", resultModel.getNoRec()); } } else{ result = null; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatTumbuhKembangServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatTumbuhKembangServiceImpl.java index 9122f063..de320c90 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatTumbuhKembangServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRiwayatTumbuhKembangServiceImpl.java @@ -1,29 +1,25 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.PapImunisasiDetailConverter; import com.jasamedika.medifirst2000.converter.PapRiwayatTumbuhKembangConverter; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.PapRiwayatTumbuhKembangDao; import com.jasamedika.medifirst2000.dao.PasienDao; import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.PapImunisasiDetail; import com.jasamedika.medifirst2000.entities.PapRiwayatTumbuhKembang; import com.jasamedika.medifirst2000.entities.Pasien; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapRiwayatTumbuhKembangService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.PapImunisasiDetailVO; import com.jasamedika.medifirst2000.vo.PapRiwayatTumbuhKembangVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Implement class for PAPRiwayatTumbuhKembangService @@ -60,7 +56,7 @@ public class PapRiwayatTumbuhKembangServiceImpl implements PapRiwayatTumbuhKemba } if(CommonUtil.isNotNullOrEmpty(model)){ PapRiwayatTumbuhKembang resultModel=papRiwayatTumbuhKembangDao.save(model); - result.put("noRec", resultModel.noRec); + result.put("noRec", resultModel.getNoRec()); } } else{ result = null; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapSkriningGiziServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapSkriningGiziServiceImpl.java index afb5595f..83cba880 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapSkriningGiziServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapSkriningGiziServiceImpl.java @@ -1,20 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -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.data.domain.Sort; -import org.springframework.data.domain.Sort.Direction; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.PapSkriningGiziConverter; import com.jasamedika.medifirst2000.converter.PapSkriningGiziDetailConverter; @@ -24,22 +9,22 @@ import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.PapSkriningGiziDao; import com.jasamedika.medifirst2000.dao.PapSkriningGiziDetailDao; import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.DataPertanyaanSkriningGizi; -import com.jasamedika.medifirst2000.entities.PapSkriningGizi; -import com.jasamedika.medifirst2000.entities.PapSkriningGiziDetail; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PengkajianAwalBaru; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapSkriningGiziService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.GridSkriningGiziSkorVO; -import com.jasamedika.medifirst2000.vo.PapSkriningGiziDetailVO; -import com.jasamedika.medifirst2000.vo.PapSkriningGiziVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO; +import com.jasamedika.medifirst2000.vo.*; +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.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; + +import java.util.*; /** * Implement class for PAPSkriningGiziService @@ -124,7 +109,7 @@ public class PapSkriningGiziServiceImpl extends BaseVoServiceImpl implements Pap } } try { - result.put("noRec", resultModel.noRec); + result.put("noRec", resultModel.getNoRec()); } catch (IllegalArgumentException e) { e.printStackTrace(); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapStatusFungsionalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapStatusFungsionalServiceImpl.java index d6f17462..c3da68df 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapStatusFungsionalServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapStatusFungsionalServiceImpl.java @@ -1,30 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.PapStatusFungsionalDao; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.PapStatusFungsional; -import com.jasamedika.medifirst2000.entities.PengkajianAwalBaru; -import com.jasamedika.medifirst2000.entities.StatusFungsional; -import com.jasamedika.medifirst2000.entities.StatusYaTidak; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.PapStatusFungsionalService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; import com.jasamedika.medifirst2000.vo.PapStatusFungsionalVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO; import com.jasamedika.medifirst2000.vo.StatusFungsionalVO; import com.jasamedika.medifirst2000.vo.StatusYaTidakVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; @Service("PapStatusFungsionalService") @@ -75,7 +67,7 @@ public class PapStatusFungsionalServiceImpl implements PapStatusFungsionalServic } PapStatusFungsional resultModel=papStatusFungsionalDao.save(model); if(CommonUtil.isNotNullOrEmpty(resultModel)){ - result.put("noRec", resultModel.noRec); + result.put("noRec", resultModel.getNoRec()); } } else{ result = null; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java index 1b4d1fa3..0d65144a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java @@ -246,7 +246,7 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi } if(CommonUtil.isNotNullOrEmpty(strukPlanning)){ StrukPlanning strukPlanningResult = strukPlanningDao.save(strukPlanning); - result.put("noRec", strukPlanningResult.noRec); + result.put("noRec", strukPlanningResult.getNoRec()); } return result; } @@ -350,7 +350,7 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi } if(CommonUtil.isNotNullOrEmpty(planningPegawaiMuSaRe)){ PlanningPegawaiMuSaRe planningPegawaiMuSaReResult = planningPegawaiMuSaReDao.save(planningPegawaiMuSaRe); - result.put("noRec", planningPegawaiMuSaReResult.noRec); + result.put("noRec", planningPegawaiMuSaReResult.getNoRec()); StrukPlanningVO strukPlanningVO = new StrukPlanningVO(); if(CommonUtil.isNotNullOrEmpty(noPlanning)){ @@ -468,7 +468,7 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi } if(CommonUtil.isNotNullOrEmpty(planningPegawaiMuSaRe)){ PlanningPegawaiMuSaRe planningPegawaiMuSaReResult = planningPegawaiMuSaReDao.save(planningPegawaiMuSaRe); - result.put("noRec", planningPegawaiMuSaReResult.noRec); + result.put("noRec", planningPegawaiMuSaReResult.getNoRec()); StrukPlanningVO strukPlanningVO = new StrukPlanningVO(); if(CommonUtil.isNotNullOrEmpty(noPlanning)){ @@ -601,7 +601,7 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi } if(CommonUtil.isNotNullOrEmpty(planningPegawaiMuSaRe)){ PlanningPegawaiMuSaRe planningPegawaiMuSaReResult = planningPegawaiMuSaReDao.save(planningPegawaiMuSaRe); - result.put("noRec", planningPegawaiMuSaReResult.noRec); + result.put("noRec", planningPegawaiMuSaReResult.getNoRec()); StrukPlanningVO strukPlanningVO = new StrukPlanningVO(); if(CommonUtil.isNotNullOrEmpty(noPlanning)){ @@ -735,7 +735,7 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi } if(CommonUtil.isNotNullOrEmpty(planningPegawaiMuSaRe)){ PlanningPegawaiMuSaRe planningPegawaiMuSaReResult = planningPegawaiMuSaReDao.save(planningPegawaiMuSaRe); - result.put("noRec", planningPegawaiMuSaReResult.noRec); + result.put("noRec", planningPegawaiMuSaReResult.getNoRec()); } if(CommonUtil.isNotNullOrEmpty(planningPegawaiMuSaRe.getStatusMusare())){ @@ -772,7 +772,7 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi if(CommonUtil.isNotNullOrEmpty(planningPegawaiMuSaRe)){ planningPegawaiMuSaRe.setApprovalStatus(2); PlanningPegawaiMuSaRe planningPegawaiMuSaReResult = planningPegawaiMuSaReDao.save(planningPegawaiMuSaRe); - result.put("noRec", planningPegawaiMuSaReResult.noRec); + result.put("noRec", planningPegawaiMuSaReResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java index b6431f4d..2c0bb052 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java @@ -1,5 +1,24 @@ package com.jasamedika.medifirst2000.service.impl; +import com.google.gson.Gson; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.converter.PasienConverter; +import com.jasamedika.medifirst2000.converter.PegawaiConverter; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dto.PiutangRekananProfileDto; +import com.jasamedika.medifirst2000.entities.*; +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.StringUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.hibernate.Hibernate; +import org.hibernate.proxy.HibernateProxy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.IOException; @@ -8,141 +27,13 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.hibernate.Hibernate; -import org.hibernate.proxy.HibernateProxy; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.google.gson.Gson; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.converter.PasienConverter; -import com.jasamedika.medifirst2000.converter.PegawaiConverter; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.KartuStokDao; -import com.jasamedika.medifirst2000.dao.KelompokTransaksiDao; -import com.jasamedika.medifirst2000.dao.LogAccDao; -import com.jasamedika.medifirst2000.dao.MapDiagnosisToProdukDao; -import com.jasamedika.medifirst2000.dao.OrderPelayananDao; -import com.jasamedika.medifirst2000.dao.PasienDaftarDao; -import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PelayananObatDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienDetailDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienPetugasDao; -import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao; -import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.RacikanDetailDao; -import com.jasamedika.medifirst2000.dao.ResepRacikanOrderDao; -import com.jasamedika.medifirst2000.dao.ResepRacikanOrderDetailDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.StokProdukGlobalDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDetailDao; -import com.jasamedika.medifirst2000.dao.StrukRacikanDao; -import com.jasamedika.medifirst2000.dao.StrukResepDao; -import com.jasamedika.medifirst2000.dto.PiutangRekananProfileDto; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.AsalProduk; -import com.jasamedika.medifirst2000.entities.Generik; -import com.jasamedika.medifirst2000.entities.GolonganAsuransi; -import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas; -import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelasD; -import com.jasamedika.medifirst2000.entities.HubunganKeluarga; -import com.jasamedika.medifirst2000.entities.JenisKelamin; -import com.jasamedika.medifirst2000.entities.JenisKemasan; -import com.jasamedika.medifirst2000.entities.JenisObat; -import com.jasamedika.medifirst2000.entities.JenisPetugasPelaksana; -import com.jasamedika.medifirst2000.entities.JenisTarif; -import com.jasamedika.medifirst2000.entities.KartuStok; -import com.jasamedika.medifirst2000.entities.Kelas; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.KomponenHarga; -import com.jasamedika.medifirst2000.entities.LogAcc; -import com.jasamedika.medifirst2000.entities.MapPelayananPasienPetugasToPegawai; -import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.Paket; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PasienDaftar; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Pekerjaan; -import com.jasamedika.medifirst2000.entities.PelayananObat; -import com.jasamedika.medifirst2000.entities.PelayananPasien; -import com.jasamedika.medifirst2000.entities.PelayananPasienDetail; -import com.jasamedika.medifirst2000.entities.PelayananPasienPetugas; -import com.jasamedika.medifirst2000.entities.PemakaianAsuransi; -import com.jasamedika.medifirst2000.entities.Pendidikan; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.RacikanDetail; -import com.jasamedika.medifirst2000.entities.ResepRacikanOrder; -import com.jasamedika.medifirst2000.entities.ResepRacikanOrderDetail; -import com.jasamedika.medifirst2000.entities.RouteFarmasi; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StatusPerkawinan; -import com.jasamedika.medifirst2000.entities.Stigma; -import com.jasamedika.medifirst2000.entities.StokProdukGlobal; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.entities.StrukPelayanan; -import com.jasamedika.medifirst2000.entities.StrukPelayananDetail; -import com.jasamedika.medifirst2000.entities.StrukRacikan; -import com.jasamedika.medifirst2000.entities.StrukResep; -import com.jasamedika.medifirst2000.entities.TitlePasien; -import com.jasamedika.medifirst2000.service.GenerateNumberService; -import com.jasamedika.medifirst2000.service.KartuStokService; -import com.jasamedika.medifirst2000.service.PasienService; -import com.jasamedika.medifirst2000.service.PelayananObatService; -import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService; -import com.jasamedika.medifirst2000.service.ProdukService; -import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.service.StrukPelayananService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; -import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.AsalProdukVO; -import com.jasamedika.medifirst2000.vo.JenisKelaminVO; -import com.jasamedika.medifirst2000.vo.JenisKemasanVO; -import com.jasamedika.medifirst2000.vo.JenisObatVO; -import com.jasamedika.medifirst2000.vo.JenisPetugasPelaksanaVO; -import com.jasamedika.medifirst2000.vo.KelasVO; -import com.jasamedika.medifirst2000.vo.MainPelayananDetailVO; -import com.jasamedika.medifirst2000.vo.MapPelayananPasienPetugasToPegawaiVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PekerjaanVO; -import com.jasamedika.medifirst2000.vo.PelayananObatLuarVO; -import com.jasamedika.medifirst2000.vo.PelayananObatOnlyResepVO; -import com.jasamedika.medifirst2000.vo.PelayananObatVO; -import com.jasamedika.medifirst2000.vo.PelayananPasienDetailVO; -import com.jasamedika.medifirst2000.vo.PelayananPasienPetugasVO; -import com.jasamedika.medifirst2000.vo.PelayananPasienVO; -import com.jasamedika.medifirst2000.vo.PendidikanVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.RacikanDetailVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StatusPerkawinanVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; -import com.jasamedika.medifirst2000.vo.StrukPelayananDetailVO; -import com.jasamedika.medifirst2000.vo.StrukPelayananVO; -import com.jasamedika.medifirst2000.vo.StrukResepVO; -import com.jasamedika.medifirst2000.vo.TitlePasienVO; +import java.util.*; /** * Implement class for PelayananObatService * * @author Generator - * @param + * */ @Service("pelayananObatService") public class PelayananObatServiceImpl extends BaseVoServiceImpl implements PelayananObatService { @@ -3004,7 +2895,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay } if(CommonUtil.isNotNullOrEmpty(strukPelayanan)){ StrukPelayanan strukPelayananResult = strukPelayananDao.save(strukPelayanan); - result.put("noRec", strukPelayananResult.noRec); + result.put("noRec", strukPelayananResult.getNoRec()); } } } @@ -3258,7 +3149,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay PelayananPasien pelayananPasien = pelayananPasienDao.findOne(noRec); if(CommonUtil.isNotNullOrEmpty(pelayananPasien)){ PelayananPasien pelayananPasienResult = pelayananPasienDao.save(pelayananPasien); - result.put("noRec", pelayananPasienResult.noRec); + result.put("noRec", pelayananPasienResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java index bcb96942..0e4d67b5 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java @@ -1,45 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.ProdukConverter; -import com.jasamedika.medifirst2000.dao.KamarDao; -import com.jasamedika.medifirst2000.dao.OrderPelayananDao; -import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; +import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dto.PemakaianRumahDukaDto; import com.jasamedika.medifirst2000.dto.RumahDukaDto; -import com.jasamedika.medifirst2000.entities.Kamar; -import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.PenambahanKebutuhanSarana; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StrukOrder; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.enums.Status; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.PemakaianRumahDukaService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.KamarVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; -import com.jasamedika.medifirst2000.vo.PemakaianRumahDukaVO; -import com.jasamedika.medifirst2000.vo.PenambahanKebutuhanSaranaVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("PemakaianRumahDukaService") public class PemakaianRumahDukaServiceImpl extends BaseVoServiceImpl implements PemakaianRumahDukaService { @@ -112,7 +89,7 @@ public class PemakaianRumahDukaServiceImpl extends BaseVoServiceImpl implements StrukOrder strukOrderResult = this.strukOrderDao.save(strukOrder); if (CommonUtil.isNotNullOrEmpty(strukOrderResult)) { - result.put("noRec", strukOrderResult.noRec); + result.put("noRec", strukOrderResult.getNoRec()); } System.out.println("End Update"); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java index 2c8df4d4..6b1b3123 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java @@ -1,48 +1,20 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.OrderPelayananDao; -import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDetailDao; +import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dto.PemulasaraanJenazahDetailDto; -import com.jasamedika.medifirst2000.entities.CaraBayar; -import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.MappingPelayananJenazah; -import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.entities.StrukPelayanan; -import com.jasamedika.medifirst2000.entities.StrukPelayananDetail; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.enums.Status; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.PemulasaraanJenazahService; import com.jasamedika.medifirst2000.service.StrukOrderService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.CaraBayarVO; -import com.jasamedika.medifirst2000.vo.HargaNettoProdukByKelasVO; -import com.jasamedika.medifirst2000.vo.MappingPelayananJenazahVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; -import com.jasamedika.medifirst2000.vo.PemulasaraanJenazahVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("PemulasaraanJenazahService") public class PemulasaraanJenazahServiceImpl extends BaseVoServiceImpl implements PemulasaraanJenazahService { @@ -321,7 +293,7 @@ public class PemulasaraanJenazahServiceImpl extends BaseVoServiceImpl implements strukPelayananDao.save(strukPelayananResult); if (CommonUtil.isNotNullOrEmpty(strukPelayananResult)) { - result.put("noRec", strukPelayananResult.noRec); + result.put("noRec", strukPelayananResult.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PencucianLinenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PencucianLinenServiceImpl.java index 59918d70..aa4ff4b6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PencucianLinenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PencucianLinenServiceImpl.java @@ -1,13 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.PencucianLinenDao; import com.jasamedika.medifirst2000.dao.SatuanStandarDao; @@ -21,6 +13,13 @@ import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.vo.MappingCycleVO; import com.jasamedika.medifirst2000.vo.PencucianLinenVO; import com.jasamedika.medifirst2000.vo.SatuanStandarVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("pencucianLinenService") public class PencucianLinenServiceImpl implements PencucianLinenService { @@ -63,7 +62,7 @@ public class PencucianLinenServiceImpl implements PencucianLinenService { } PencucianLinen resultModel = pencucianLinenDao.save(pencucianLinen); - result.put("noRecPencucianLinen", resultModel.noRec); + result.put("noRecPencucianLinen", resultModel.getNoRec()); System.out.println("==================END SAVE PENCUCIAN LINEN======================"); } catch (Exception e) { e.printStackTrace(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenerimaanLinenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenerimaanLinenServiceImpl.java index 2cbcb919..fca3507c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenerimaanLinenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenerimaanLinenServiceImpl.java @@ -1,11 +1,15 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.PenerimaanLinenDao; +import com.jasamedika.medifirst2000.dao.RuanganDao; +import com.jasamedika.medifirst2000.dao.SatuanStandarDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PenerimaanLinenService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -16,25 +20,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.PenerimaanLinenDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.SatuanStandarDao; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.MappingCycle; -import com.jasamedika.medifirst2000.entities.MappingPenerimaanLinen; -import com.jasamedika.medifirst2000.entities.PenerimaanLinen; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.SatuanStandar; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PenerimaanLinenService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.LoginUserVO; -import com.jasamedika.medifirst2000.vo.MappingPenerimaanLinenVO; -import com.jasamedika.medifirst2000.vo.PenerimaanLinenVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.SatuanStandarVO; +import java.util.*; @Service("penerimaanLinenService") public class PenerimaanLinenServiceImpl extends BaseVoServiceImpl implements PenerimaanLinenService { @@ -102,7 +88,7 @@ public class PenerimaanLinenServiceImpl extends BaseVoServiceImpl implements Pen } PenerimaanLinen resultModel = penerimaanLinenDao.save(penerimaanLinen); - result.put("noRec Penerimaan Linen", resultModel.noRec); + result.put("noRec Penerimaan Linen", resultModel.getNoRec()); System.out.println("==================END SAVE PENERIMAAN LINEN======================"); } catch (Exception e) { e.printStackTrace(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengirimanBarangServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengirimanBarangServiceImpl.java index 9951f1c9..f33c64bf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengirimanBarangServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengirimanBarangServiceImpl.java @@ -1,12 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.PengirimanBarangDao; import com.jasamedika.medifirst2000.dao.RuanganDao; @@ -17,6 +10,12 @@ import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.vo.PengirimanBarangVO; import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("pengirimanBarangService") public class PengirimanBarangServiceImpl implements PengirimanBarangService { @@ -50,7 +49,7 @@ public class PengirimanBarangServiceImpl implements PengirimanBarangService { } PengirimanBarang resultModel = pengirimanBarangDao.save(pengirimanBarang); - result.put("noRec Pengiriman Barang (Loundry)", resultModel.noRec); + result.put("noRec Pengiriman Barang (Loundry)", resultModel.getNoRec()); System.out.println("==================END SAVE PENGIRIMAN BARANG======================"); } catch (Exception e) { e.printStackTrace(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalBaruServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalBaruServiceImpl.java index 103489b1..609c5c96 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalBaruServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalBaruServiceImpl.java @@ -1,14 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.PengkajianAwalBaruDao; import com.jasamedika.medifirst2000.dao.SettingDataFixedDao; @@ -23,6 +14,13 @@ import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO; import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("PengkajianAwalBaruService") public class PengkajianAwalBaruServiceImpl implements PengkajianAwalBaruService{ @@ -112,7 +110,7 @@ public class PengkajianAwalBaruServiceImpl implements PengkajianAwalBaruService{ } if(CommonUtil.isNotNullOrEmpty(pengkajianAwalBaru)){ PengkajianAwalBaru pengkajianAwalBaruResult = pengkajianAwalBaruDao.save(pengkajianAwalBaru); - result.put("noRec", pengkajianAwalBaruResult.noRec); + result.put("noRec", pengkajianAwalBaruResult.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalTransaksiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalTransaksiServiceImpl.java index 34cabba6..855b5bc0 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalTransaksiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalTransaksiServiceImpl.java @@ -1,34 +1,23 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.DetailPengkajianAwalDao; import com.jasamedika.medifirst2000.dao.PengkajianAwalTransaksiDao; -import com.jasamedika.medifirst2000.dto.PengkajianAwalDto; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; import com.jasamedika.medifirst2000.entities.DetailPengkajianAwal; -import com.jasamedika.medifirst2000.entities.PengkajianAwalTransaksi; -import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.PengkajianAwal; import com.jasamedika.medifirst2000.entities.PengkajianAwalBaru; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.service.PengkajianAwalTransaksiService; +import com.jasamedika.medifirst2000.entities.PengkajianAwalTransaksi; import com.jasamedika.medifirst2000.service.PengkajianAwalService; +import com.jasamedika.medifirst2000.service.PengkajianAwalTransaksiService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; import com.jasamedika.medifirst2000.vo.DetailPengkajianAwalVO; -import com.jasamedika.medifirst2000.vo.PengkajianAwalTransaksiVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO; +import com.jasamedika.medifirst2000.vo.PengkajianAwalTransaksiVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("PengkajianAwalTransaksiService") public class PengkajianAwalTransaksiServiceImpl implements PengkajianAwalTransaksiService{ @@ -90,7 +79,7 @@ public class PengkajianAwalTransaksiServiceImpl implements PengkajianAwalTransak } if(CommonUtil.isNotNullOrEmpty(pengkajianAwalTransaksi)){ PengkajianAwalTransaksi headPengkajianAwalResult = pengkajianAwalTransaksiDao.save(pengkajianAwalTransaksi); - result.put("noRec", headPengkajianAwalResult.noRec); + result.put("noRec", headPengkajianAwalResult.getNoRec()); } return result; @@ -155,7 +144,7 @@ public class PengkajianAwalTransaksiServiceImpl implements PengkajianAwalTransak } if(CommonUtil.isNotNullOrEmpty(pengkajianAwalTransaksi)){ PengkajianAwalTransaksi headPengkajianAwalResult = pengkajianAwalTransaksiDao.save(pengkajianAwalTransaksi); - result.put("noRec", headPengkajianAwalResult.noRec); + result.put("noRec", headPengkajianAwalResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianKebutuhanDasarServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianKebutuhanDasarServiceImpl.java index 72cf146a..c3c1ae6b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianKebutuhanDasarServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianKebutuhanDasarServiceImpl.java @@ -1,14 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.PengkajianKebutuhanDasarDao; import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; @@ -21,6 +12,10 @@ import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; import com.jasamedika.medifirst2000.vo.MapPengkajianKebutuhanDasarVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO; import com.jasamedika.medifirst2000.vo.PengkajianKebutuhanDasarVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("pengkajianKebutuhanDasarService") public class PengkajianKebutuhanDasarServiceImpl implements PengkajianKebutuhanDasarService{ @@ -77,7 +72,7 @@ public class PengkajianKebutuhanDasarServiceImpl implements PengkajianKebutuhanD } if(CommonUtil.isNotNullOrEmpty(pengkajianKebutuhanDasar)){ PengkajianKebutuhanDasar pengkajianKebutuhanDasarResult = pengkajianKebutuhanDasarDao.save(pengkajianKebutuhanDasar); - result.put("noRec", pengkajianKebutuhanDasarResult.noRec); + result.put("noRec", pengkajianKebutuhanDasarResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianLanjutanTransaksiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianLanjutanTransaksiServiceImpl.java index ca2b2ee1..75af4120 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianLanjutanTransaksiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianLanjutanTransaksiServiceImpl.java @@ -1,15 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.DetailPengkajianAwalDao; import com.jasamedika.medifirst2000.dao.PengkajianAwalBaruDao; @@ -25,6 +15,10 @@ import com.jasamedika.medifirst2000.vo.DetailPengkajianAwalVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalTransaksiVO; import com.jasamedika.medifirst2000.vo.PengkajianAwalVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; @Service("PengkajianLanjutanTransaksiService") public class PengkajianLanjutanTransaksiServiceImpl implements PengkajianLanjutanTransaksiService{ @@ -94,7 +88,7 @@ public class PengkajianLanjutanTransaksiServiceImpl implements PengkajianLanjuta } if(CommonUtil.isNotNullOrEmpty(pengkajianAwalTransaksi)){ PengkajianAwalTransaksi headPengkajianAwalResult = pengkajianAwalTransaksiDao.save(pengkajianAwalTransaksi); - result.put("noRec", headPengkajianAwalResult.noRec); + result.put("noRec", headPengkajianAwalResult.getNoRec()); } return result; @@ -159,7 +153,7 @@ public class PengkajianLanjutanTransaksiServiceImpl implements PengkajianLanjuta } if(CommonUtil.isNotNullOrEmpty(pengkajianAwalTransaksi)){ PengkajianAwalTransaksi headPengkajianAwalResult = pengkajianAwalTransaksiDao.save(pengkajianAwalTransaksi); - result.put("noRec", headPengkajianAwalResult.noRec); + result.put("noRec", headPengkajianAwalResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenilaianKinerjaSatpamServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenilaianKinerjaSatpamServiceImpl.java index cc442bcd..9ae787f7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenilaianKinerjaSatpamServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenilaianKinerjaSatpamServiceImpl.java @@ -1,29 +1,20 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.PenilaianKinerjaSatpamDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.PenilaianKinerjaSatpamService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.PenilaianKinerjaSatpamDao; -import com.jasamedika.medifirst2000.entities.MappingKualitas; -import com.jasamedika.medifirst2000.entities.MappingSikapPerilaku; -import com.jasamedika.medifirst2000.entities.MappingUraianTugas; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PenilaianKinerjaSatpam; -import com.jasamedika.medifirst2000.service.PenilaianKinerjaSatpamService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.MappingKualitasVO; -import com.jasamedika.medifirst2000.vo.MappingSikapPerilakuVO; -import com.jasamedika.medifirst2000.vo.MappingUraianTugasVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PenilaianKinerjaSatpamVO; - @Service("PenilaianKinerjaSatpamService") public class PenilaianKinerjaSatpamServiceImpl implements PenilaianKinerjaSatpamService { @@ -130,7 +121,7 @@ public class PenilaianKinerjaSatpamServiceImpl implements PenilaianKinerjaSatpam } PenilaianKinerjaSatpam resultModel = penilaianKinerjaSatpamDao.save(kinerjaSatpam); - result.put("noRecPenilaianKinerjaSatpam", resultModel.noRec); + result.put("noRecPenilaianKinerjaSatpam", resultModel.getNoRec()); System.out.println("==================END SAVE PENILAIAN KINERJA SATPAM======================"); } catch (Exception e) { e.printStackTrace(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java index c496815e..c5393dbf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java @@ -1499,7 +1499,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus)) { PlanningPegawaiStatus planningPegawaiStatusResult = planningPegawaiStatusDao .save(planningPegawaiStatus); - if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatusResult.noRec)) { + if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatusResult.getNoRec())) { result = checkKelompokShiftKerja(vo, planningPegawaiStatus.getStatusPegawaiPlan().getId(), planningPegawaiStatusResult.getNoRec()); } @@ -1630,7 +1630,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (CommonUtil.isNullOrEmpty(data)) { PegawaiHistoriRekapIndex pegawaiHistoriRekapIndexResult = pegawaiHistoriRekapIndexDao .save(pegawaiHistoriRekapIndex); - result.put("noRec", pegawaiHistoriRekapIndexResult.noRec); + result.put("noRec", pegawaiHistoriRekapIndexResult.getNoRec()); System.out.println((String) komponenIndexMap.get("komponenIndex")); } } @@ -1646,7 +1646,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus)) { planningPegawaiStatus.setApprovalStatus(2); PlanningPegawaiStatus planningPegawaiStatusResult = planningPegawaiStatusDao.save(planningPegawaiStatus); - result.put("noRec", planningPegawaiStatusResult.noRec); + result.put("noRec", planningPegawaiStatusResult.getNoRec()); } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PlanningHistoriPelayananCsServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PlanningHistoriPelayananCsServiceImpl.java index 0b646c77..f84dff5d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PlanningHistoriPelayananCsServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PlanningHistoriPelayananCsServiceImpl.java @@ -1,39 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.PlanningHistoriPelayananCsDao; +import com.jasamedika.medifirst2000.dao.StrukPlanningDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.PlanningHistoriPelayananCsService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.PlanningHistoriPelayananCsDao; -import com.jasamedika.medifirst2000.dao.StrukPlanningDao; -import com.jasamedika.medifirst2000.entities.HistoriPelayananCs; -import com.jasamedika.medifirst2000.entities.JenisRespon; -import com.jasamedika.medifirst2000.entities.Komunikasi; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PlanningHistoriPelayananCs; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StrukPlanning; -import com.jasamedika.medifirst2000.service.PlanningHistoriPelayananCsService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.HistoriPelayananCsVO; -import com.jasamedika.medifirst2000.vo.JenisResponVO; -import com.jasamedika.medifirst2000.vo.KomunikasiVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PlanningHistoriPelayananCsVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StrukPlanningVO; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service(" PlanningHistoriPelayananCsService") public class PlanningHistoriPelayananCsServiceImpl implements PlanningHistoriPelayananCsService { @@ -108,7 +91,7 @@ public class PlanningHistoriPelayananCsServiceImpl implements PlanningHistoriPel PlanningHistoriPelayananCs planningHistoriCsResult = this.planningHistoriPelayananCsDao .save(planningHistoriCs); - result.put("NoRecPlanning", planningHistoriCsResult.noRec); + result.put("NoRecPlanning", planningHistoriCsResult.getNoRec()); if (CommonUtil.isNotNullOrEmpty(vo.getStrukPlanning())) { @@ -131,7 +114,7 @@ public class PlanningHistoriPelayananCsServiceImpl implements PlanningHistoriPel vo.getStrukPlanning().getKdruanganasal(), new Ruangan())); StrukPlanning strukPlanningResult = this.strukPlanningDao.save(strukPlanning); - result.put("noRecStruk", strukPlanningResult.noRec); + result.put("noRecStruk", strukPlanningResult.getNoRec()); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienRawatInapServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienRawatInapServiceImpl.java index a375af85..850310ac 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienRawatInapServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienRawatInapServiceImpl.java @@ -1,71 +1,10 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Transactional; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.JadwalDokterDao; -import com.jasamedika.medifirst2000.dao.KelasDao; -import com.jasamedika.medifirst2000.dao.MapPasienBayiToPasienIbuDao; -import com.jasamedika.medifirst2000.dao.PasienDaftarDao; -import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; +import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dto.RuanganJumlah; import com.jasamedika.medifirst2000.dto.StrukPelayananDto; -import com.jasamedika.medifirst2000.entities.Agama; -import com.jasamedika.medifirst2000.entities.Alamat; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.AsalRujukan; -import com.jasamedika.medifirst2000.entities.CatatanPasien; -import com.jasamedika.medifirst2000.entities.DesaKelurahan; -import com.jasamedika.medifirst2000.entities.Diagnosa; -import com.jasamedika.medifirst2000.entities.Diputuskan; -import com.jasamedika.medifirst2000.entities.DiputuskanDetail; -import com.jasamedika.medifirst2000.entities.HubunganKeluarga; -import com.jasamedika.medifirst2000.entities.JadwalDokter; -import com.jasamedika.medifirst2000.entities.JenisAlamat; -import com.jasamedika.medifirst2000.entities.JenisKelamin; -import com.jasamedika.medifirst2000.entities.Kamar; -import com.jasamedika.medifirst2000.entities.KasusPenyakit; -import com.jasamedika.medifirst2000.entities.Kebangsaan; -import com.jasamedika.medifirst2000.entities.Kecamatan; -import com.jasamedika.medifirst2000.entities.Kelas; -import com.jasamedika.medifirst2000.entities.KelompokPasien; -import com.jasamedika.medifirst2000.entities.KondisiPasien; -import com.jasamedika.medifirst2000.entities.KotaKabupaten; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.MapPasienBayiToPasienIbu; -import com.jasamedika.medifirst2000.entities.Negara; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PasienDaftar; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Pekerjaan; -import com.jasamedika.medifirst2000.entities.PemakaianAsuransi; -import com.jasamedika.medifirst2000.entities.PenanggungJawabPasien; -import com.jasamedika.medifirst2000.entities.Pendidikan; -import com.jasamedika.medifirst2000.entities.Propinsi; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StatusKeluar; -import com.jasamedika.medifirst2000.entities.StatusPerkawinan; -import com.jasamedika.medifirst2000.entities.StatusPulang; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.entities.StrukRetur; -import com.jasamedika.medifirst2000.entities.TitlePasien; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.enums.TipePasienEnum; import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService; import com.jasamedika.medifirst2000.service.PasienDaftarService; @@ -73,45 +12,13 @@ import com.jasamedika.medifirst2000.service.RegistrasiPasienRawatInapService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.AgamaVO; -import com.jasamedika.medifirst2000.vo.AlamatVO; -import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.AsalRujukanVO; -import com.jasamedika.medifirst2000.vo.CatatanPasienVO; -import com.jasamedika.medifirst2000.vo.DesaKelurahanVO; -import com.jasamedika.medifirst2000.vo.DiagnosaVO; -import com.jasamedika.medifirst2000.vo.DiputuskanDetailVO; -import com.jasamedika.medifirst2000.vo.DiputuskanVO; -import com.jasamedika.medifirst2000.vo.HubunganKeluargaVO; -import com.jasamedika.medifirst2000.vo.JenisAlamatVO; -import com.jasamedika.medifirst2000.vo.JenisKelaminVO; -import com.jasamedika.medifirst2000.vo.KamarVO; -import com.jasamedika.medifirst2000.vo.KasusPenyakitVO; -import com.jasamedika.medifirst2000.vo.KebangsaanVO; -import com.jasamedika.medifirst2000.vo.KecamatanVO; -import com.jasamedika.medifirst2000.vo.KelasVO; -import com.jasamedika.medifirst2000.vo.KelompokPasienVO; -import com.jasamedika.medifirst2000.vo.KondisiPasienVO; -import com.jasamedika.medifirst2000.vo.KotaKabupatenVO; -import com.jasamedika.medifirst2000.vo.LoginUserVO; -import com.jasamedika.medifirst2000.vo.NegaraVO; -import com.jasamedika.medifirst2000.vo.PasienDaftarVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PekerjaanVO; -import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; -import com.jasamedika.medifirst2000.vo.PenanggungJawabPasienVO; -import com.jasamedika.medifirst2000.vo.PendidikanVO; -import com.jasamedika.medifirst2000.vo.PropinsiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; -import com.jasamedika.medifirst2000.vo.RekananVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StatusKeluarVO; -import com.jasamedika.medifirst2000.vo.StatusPerkawinanVO; -import com.jasamedika.medifirst2000.vo.StatusPulangVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; -import com.jasamedika.medifirst2000.vo.StrukReturVO; -import com.jasamedika.medifirst2000.vo.TitlePasienVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; @Service("RegistrasiPasienRawatInapService") public class RegistrasiPasienRawatInapServiceImpl implements RegistrasiPasienRawatInapService{ @@ -629,7 +536,7 @@ public class RegistrasiPasienRawatInapServiceImpl implements RegistrasiPasienRaw } if(CommonUtil.isNotNullOrEmpty(pasienDaftar)){ PasienDaftar pasienDaftarResult = pasienDaftarDao.save(pasienDaftar); - result.put("noRec", pasienDaftarResult.noRec); + result.put("noRec", pasienDaftarResult.getNoRec()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java index 5e5ad869..43b918f2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java @@ -3681,7 +3681,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl for (AntrianPasienDiPeriksa antrianPasienDiPeriksa : antrianPasienDiPeriksaList) { GridAntrianPasienDiPeriksaVO gridAntrianPasienDiPeriksaVO = new GridAntrianPasienDiPeriksaVO(); Map pemeriksaan = antrianPasienDiPeriksaDao - .findProdukByNoRecAntrian(antrianPasienDiPeriksa.noRec); + .findProdukByNoRecAntrian(antrianPasienDiPeriksa.getNoRec()); gridAntrianPasienDiPeriksaVO.setNoRec(antrianPasienDiPeriksa.getNoRec()); gridAntrianPasienDiPeriksaVO.setNoAntrian(antrianPasienDiPeriksa.getNoAntrian()); if (CommonUtil.isNotNullOrEmpty(pemeriksaan.get("pemeriksaan"))) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenilaianKompetensiPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenilaianKompetensiPegawaiServiceImpl.java index ea4c2172..ad34136a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenilaianKompetensiPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenilaianKompetensiPegawaiServiceImpl.java @@ -1,44 +1,23 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.RiwayatPenilaianKompetensiPegawaiDao; import com.jasamedika.medifirst2000.dao.RunningNumberDao; import com.jasamedika.medifirst2000.dao.StrukHistoriDao; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.KomponenEvaluasi; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PegawaiHistoriEvaluasi; -import com.jasamedika.medifirst2000.entities.PegawaiHistoriEvaluasiKomponen; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StrukHistori; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.RiwayatPenilaianKompetensiPegawaiService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO; -import com.jasamedika.medifirst2000.vo.KomponenEvaluasiVO; -import com.jasamedika.medifirst2000.vo.PegawaiHistoriEvaluasiKomponenVO; -import com.jasamedika.medifirst2000.vo.PegawaiHistoriEvaluasiVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Service("RiwayatPenilaianKompetensiPegawaiService") public class RiwayatPenilaianKompetensiPegawaiServiceImpl implements RiwayatPenilaianKompetensiPegawaiService { @@ -197,7 +176,7 @@ public class RiwayatPenilaianKompetensiPegawaiServiceImpl implements RiwayatPeni strukHistori.getPegawaiHistoriEvaluasiKomponen().addAll(listPegawaiHistoriEvaluasiKomponen); if (CommonUtil.isNotNullOrEmpty(strukHistori)) { StrukHistori model = strukHistoriDao.save(strukHistori); - result.put(model.getNoRec() + "", model.noRec); + result.put(model.getNoRec() + "", model.getNoRec()); } } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java index 3aceaab1..762a7cff 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java @@ -1,43 +1,8 @@ package com.jasamedika.medifirst2000.service.impl; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.KelompokTransaksiDao; -import com.jasamedika.medifirst2000.dao.KomponenHargaDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.StrukHistoriDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDao; -import com.jasamedika.medifirst2000.dao.StrukVerifikasiDao; -import com.jasamedika.medifirst2000.dao.ViewGajiPegawaiDao; -import com.jasamedika.medifirst2000.entities.JenisGaji; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.KomponenHarga; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekap; -import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapGaji; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StrukHistori; -import com.jasamedika.medifirst2000.entities.StrukPelayanan; -import com.jasamedika.medifirst2000.entities.StrukVerifikasi; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.StrukHistoriService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; @@ -46,6 +11,15 @@ import com.jasamedika.medifirst2000.util.StringUtil; import com.jasamedika.medifirst2000.vo.GajiPegawaiVO; import com.jasamedika.medifirst2000.vo.JenisGajiVO; import com.jasamedika.medifirst2000.vo.StrukHistoriVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.util.*; @Service("StrukHistoriService") public class StrukHistoriServiceImpl extends BaseVoServiceImpl implements StrukHistoriService { @@ -211,11 +185,11 @@ public class StrukHistoriServiceImpl extends BaseVoServiceImpl implements StrukH strukHistori = strukHistoriDao.save(strukHistori); if (!strukHistori.getNoRec().isEmpty()) { - result.put("noRec.StrukHistori.importGaji", strukHistori.noRec); + result.put("noRec.StrukHistori.importGaji", strukHistori.getNoRec()); if (!strukHistori.getPegawaiHistoriRekap().isEmpty()) { for (PegawaiHistoriRekap rekap : strukHistori.getPegawaiHistoriRekap()) { if (!rekap.getNoRec().isEmpty()) { - result.put("noRec.importGaji.PegawaiHistoriRekap", rekap.noRec); + result.put("noRec.importGaji.PegawaiHistoriRekap", rekap.getNoRec()); } } } @@ -336,11 +310,11 @@ public class StrukHistoriServiceImpl extends BaseVoServiceImpl implements StrukH strukHistori = strukHistoriDao.save(strukHistori); if (!strukHistori.getNoRec().isEmpty()) { - result.put("noRec.StrukHistori.gajiPegawai", strukHistori.noRec); + result.put("noRec.StrukHistori.gajiPegawai", strukHistori.getNoRec()); if (!strukHistori.getPegawaiHistoriRekap().isEmpty()) { for (PegawaiHistoriRekap rekap : strukHistori.getPegawaiHistoriRekap()) { if (!rekap.getNoRec().isEmpty()) { - result.put("noRec.gajiPegawai.PegawaiHistoriRekap", rekap.noRec); + result.put("noRec.gajiPegawai.PegawaiHistoriRekap", rekap.getNoRec()); } } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java index 23063d00..e6647160 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java @@ -1,77 +1,24 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.StrukKirimDaoCustom; +import com.jasamedika.medifirst2000.dao.custom.StrukOrderDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +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.HibernateInitialize; +import com.jasamedika.medifirst2000.util.StringUtil; +import com.jasamedika.medifirst2000.vo.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.KirimProdukDao; -import com.jasamedika.medifirst2000.dao.OrderPelayananDao; -import com.jasamedika.medifirst2000.dao.PlanningPelayananPetugasDao; -import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.RegistrasiAsetDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.SatuanStandarDao; -import com.jasamedika.medifirst2000.dao.StokProdukGlobalDao; -import com.jasamedika.medifirst2000.dao.StrukKirimDao; -import com.jasamedika.medifirst2000.dao.StrukKonfirmasiDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.dao.StrukVerifikasiDao; -import com.jasamedika.medifirst2000.dao.custom.StrukKirimDaoCustom; -import com.jasamedika.medifirst2000.dao.custom.StrukOrderDaoCustom; -import com.jasamedika.medifirst2000.entities.AsalProduk; -import com.jasamedika.medifirst2000.entities.JenisPermintaan; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.KelompokUser; -import com.jasamedika.medifirst2000.entities.KirimProduk; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.SatuanStandar; -import com.jasamedika.medifirst2000.entities.StokProdukGlobal; -import com.jasamedika.medifirst2000.entities.StrukKirim; -import com.jasamedika.medifirst2000.entities.StrukKonfirmasi; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.entities.StrukPelayanan; -import com.jasamedika.medifirst2000.entities.StrukVerifikasi; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.KartuStokService; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.PphpService; -import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.service.StrukOrderService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.HibernateInitialize; -import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.AsalProdukVO; -import com.jasamedika.medifirst2000.vo.JenisPermintaanVO; -import com.jasamedika.medifirst2000.vo.KirimProdukVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananCustomVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.RekananVO; -import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganDetailVO; -import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.SatuanStandarVO; -import com.jasamedika.medifirst2000.vo.StatusBarangVO; -import com.jasamedika.medifirst2000.vo.StrukKirimVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; +import java.util.*; /** @@ -393,7 +340,7 @@ public class StrukOrderServiceImpl extends BaseAngaranServiceImpl implements Str vo.setJenisPermintaan(jenisPermintaanConverter.transferModelToVO(jenisPermintaan, new JenisPermintaanVO())); } - for(OrderPelayanan orderPelayanan:strukKirimDao.findOrderPelayananByParent(model.noRec)){ + for(OrderPelayanan orderPelayanan:strukKirimDao.findOrderPelayananByParent(model.getNoRec())){ OrderPelayananVO orderPelayananVO=new OrderPelayananVO(); if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getProduk())){ for(Mapdata:findAllSatuanStandardProduk(orderPelayanan.getProduk().getId())){ diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java index 6ae6dda3..52d17eb2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java @@ -357,7 +357,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme transferPasienInternal.setStatusKemandirian(model); transferPasienInternal.setDiagnosaSekunder(setDiagnosaSekunder); //String noRegistrasi = transferPasienInternalDao.findNoRegistrasi(antrianPasienDiPeriksa.noRec); - String noRec = transferPasienInternalDao.findTransferPasienInternal(antrianPasienDiPeriksa.noRec); + String noRec = transferPasienInternalDao.findTransferPasienInternal(antrianPasienDiPeriksa.getNoRec()); if(CommonUtil.isNotNullOrEmpty(noRec)) { TransferPasienInternal currentModel = transferPasienInternalDao.findOne(noRec); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UploadDownloadImageServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UploadDownloadImageServiceImpl.java index 1acc6ef5..4cfa7b3b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UploadDownloadImageServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UploadDownloadImageServiceImpl.java @@ -1,15 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import org.apache.commons.codec.binary.Base64; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.FileDirectoryDao; import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; @@ -17,6 +7,12 @@ import com.jasamedika.medifirst2000.entities.FileDirectory; import com.jasamedika.medifirst2000.service.UploadDownloadImageService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.UploadImageVO; +import org.apache.commons.codec.binary.Base64; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; @Service("UploadImageService") public class UploadDownloadImageServiceImpl implements UploadDownloadImageService{ @@ -57,7 +53,7 @@ public class UploadDownloadImageServiceImpl implements UploadDownloadImageServic } if(CommonUtil.isNotNullOrEmpty(model)) { FileDirectory fileDirectoryResult = fileDirectoryDao.save(model); - result.put("norec", fileDirectoryResult.noRec); + result.put("norec", fileDirectoryResult.getNoRec()); } } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java index 6126a332..4326fe48 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java @@ -1,47 +1,20 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.LoginUserService; +import com.jasamedika.medifirst2000.service.UraianTugasTransaksiService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.web.configurers.UrlAuthorizationConfigurer; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.FactorRateKelompokShiftDao; -import com.jasamedika.medifirst2000.dao.IndekKinerjaDao; -import com.jasamedika.medifirst2000.dao.MappingPegawaiToAtasanDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.UraianTugasFlexibleDao; -import com.jasamedika.medifirst2000.dao.UraianTugasMDao; -import com.jasamedika.medifirst2000.dao.UraianTugasTransaksiDao; -import com.jasamedika.medifirst2000.entities.DetailUraianTugasTransaksi; -import com.jasamedika.medifirst2000.entities.Dokumen; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PelaksanaanTugas; -import com.jasamedika.medifirst2000.entities.RincianKegiatan; -import com.jasamedika.medifirst2000.entities.UraianTugasFlexible; -import com.jasamedika.medifirst2000.entities.UraianTugasM; -import com.jasamedika.medifirst2000.entities.UraianTugasTransaksi; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.UraianTugasTransaksiService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.DetailUraianTugasTransaksiVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RincianKegiatanVO; -import com.jasamedika.medifirst2000.vo.UraianTugasCustomVO; -import com.jasamedika.medifirst2000.vo.UraianTugasFlexibleVO; -import com.jasamedika.medifirst2000.vo.UraianTugasTransaksiVO; +import java.util.*; @Service("uraianTugasTransaksiServiceImpl") public class UraianTugasTransaksiServiceImpl extends BaseVoServiceImpl implements UraianTugasTransaksiService { @@ -168,7 +141,7 @@ public class UraianTugasTransaksiServiceImpl extends BaseVoServiceImpl implement uraianTugasTransaksi.setDetailUraianTugas(listDetail); if (CommonUtil.isNotNullOrEmpty(uraianTugasTransaksi)) { UraianTugasTransaksi model = uraianTugasTransaksiDao.save(uraianTugasTransaksi); - result.put(model.getRincianKegiatanId() + "", model.noRec); + result.put(model.getRincianKegiatanId() + "", model.getNoRec()); } } } @@ -220,7 +193,7 @@ public class UraianTugasTransaksiServiceImpl extends BaseVoServiceImpl implement } if (CommonUtil.isNotNullOrEmpty(uraianTugasTransaksi)) { UraianTugasTransaksi model = uraianTugasTransaksiDao.save(uraianTugasTransaksi); - result.put(model.getRincianKegiatanId() + "", model.noRec); + result.put(model.getRincianKegiatanId() + "", model.getNoRec()); } } } diff --git a/jasamedika-config/src/main/resources/META-INF/persistence.xml b/jasamedika-config/src/main/resources/META-INF/persistence.xml index f0a95fdd..1896d375 100644 --- a/jasamedika-config/src/main/resources/META-INF/persistence.xml +++ b/jasamedika-config/src/main/resources/META-INF/persistence.xml @@ -1,19 +1,17 @@ - - - org.hibernate.jpa.HibernatePersistenceProvider + + + org.hibernate.jpa.HibernatePersistenceProvider - - - - - - - - - - - - - + + + + + + + + diff --git a/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/Stock.hbm.xml b/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/Stock.hbm.xml deleted file mode 100644 index 84be0dfe..00000000 --- a/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/Stock.hbm.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jasamedika-config/src/main/resources/logback-development.xml b/jasamedika-config/src/main/resources/logback-development.xml index 887a69e9..43042757 100644 --- a/jasamedika-config/src/main/resources/logback-development.xml +++ b/jasamedika-config/src/main/resources/logback-development.xml @@ -1,28 +1,11 @@ - - - - - - - - - - - - diff --git a/jasamedika-config/src/main/resources/logback-production.xml b/jasamedika-config/src/main/resources/logback-production.xml index 2e8347c6..a4a61b03 100644 --- a/jasamedika-config/src/main/resources/logback-production.xml +++ b/jasamedika-config/src/main/resources/logback-production.xml @@ -1,9 +1,6 @@ - - - diff --git a/jasamedika-config/src/main/resources/logback.xml b/jasamedika-config/src/main/resources/logback.xml index 1795254f..5bfc7455 100644 --- a/jasamedika-config/src/main/resources/logback.xml +++ b/jasamedika-config/src/main/resources/logback.xml @@ -1,20 +1,18 @@ - %d %-5level %logger{35} - %msg %n - - + true ${catalina.home:-.}/logs/%d{yyyy-MM-dd_HH}/coba-${spring.profiles.active:-development}.log - 384 @@ -22,8 +20,5 @@ %d %-5level %logger{35} - %msg %n - - - + - diff --git a/jasamedika-config/src/main/resources/messages_en.properties b/jasamedika-config/src/main/resources/messages_en.properties index e077ad86..52c40763 100644 --- a/jasamedika-config/src/main/resources/messages_en.properties +++ b/jasamedika-config/src/main/resources/messages_en.properties @@ -9,4 +9,4 @@ label.try_again = PLEASE TRY AGAIN # Data Validation Message NotEmpty = Must not be empty -Length = Length should be {1} \ No newline at end of file +Length.regexp = Length should be {1} \ No newline at end of file diff --git a/jasamedika-config/src/main/resources/messages_ina.properties b/jasamedika-config/src/main/resources/messages_ina.properties index b8427353..f95f5f2e 100644 --- a/jasamedika-config/src/main/resources/messages_ina.properties +++ b/jasamedika-config/src/main/resources/messages_ina.properties @@ -11,5 +11,5 @@ label.update.data.cuti = Memperbaharui Data Cuti # Data Validation Message NotEmpty = Tidak boleh kosong -NotNull = {0} Tidak boleh kosong -Length = Panjang seharusnya {1} \ No newline at end of file +NotNull = {0} Tidak boleh kosong +Length.regexp = Panjang seharusnya {1} \ No newline at end of file diff --git a/jasamedika-core/pom.xml b/jasamedika-core/pom.xml index e60cfec5..b5856c47 100644 --- a/jasamedika-core/pom.xml +++ b/jasamedika-core/pom.xml @@ -76,6 +76,14 @@ itextpdf 5.5.9 + + + + org.projectlombok + lombok + ${project.lombok.version} + provided + Jasa Medika diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/Base.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/Base.java deleted file mode 100644 index 33d1496d..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/Base.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import java.io.Serializable; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author Roberto - */ -public class Base implements Serializable { - /** - * serialVersionUID - */ - private static final long serialVersionUID = 2852686906555972960L; - protected String idString; - - public Base(String idString) { - super(); - this.idString = idString; - } - - public Base() { - } - - public String getIdString() { - return idString; - } - - public void setIdString(String idString) { - this.idString = idString; - } -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseActive.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseActive.java index b5220b51..56c971c6 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseActive.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseActive.java @@ -1,6 +1,7 @@ package com.jasamedika.medifirst2000.base; -import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -10,19 +11,11 @@ import javax.persistence.MappedSuperclass; * * @author Adik */ +@Getter +@Setter @MappedSuperclass -public abstract class BaseActive extends BaseProfile implements Serializable { - +public abstract class BaseActive extends BaseProfile { + @Column(name = "statusEnabled") - public Boolean statusEnabled; - - public Boolean getStatusEnabled() { - return statusEnabled; - } - - public void setStatusEnabled(Boolean statusEnabled) { - this.statusEnabled = statusEnabled; - } - - + protected Boolean statusEnabled; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseBridging.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseBridging.java deleted file mode 100644 index d0d817ca..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseBridging.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author andri - */ -@MappedSuperclass -public class BaseBridging extends BaseActive implements Serializable { - -//belum ada field yang akan di tambah, sementara hanya agar bisa di serialize - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMapping.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMapping.java deleted file mode 100644 index aa48dd05..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMapping.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jasamedika.medifirst2000.base; - - /** - * @author Andri - */ -public abstract class BaseMapping extends BaseProfile { - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMaster.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMaster.java index 04265692..3c5d5a94 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMaster.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMaster.java @@ -1,34 +1,28 @@ package com.jasamedika.medifirst2000.base; -import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.validator.constraints.Length; import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.MappedSuperclass; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - /** * Base class for all entities, but using String idString as 'id' * * @author Adik */ +@Getter +@Setter @MappedSuperclass -public class BaseMaster extends BaseActive implements Serializable { +public abstract class BaseMaster extends BaseActive { @GeneratedValue(generator = "uuid") @GenericGenerator(name = "uuid", strategy = "uuid") @Column(columnDefinition = "CHAR(32)") - private String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } + protected String noRec; @Length(min = 1, max = 50, message = "") @Column(name = "reportDisplay") @@ -41,29 +35,4 @@ public class BaseMaster extends BaseActive implements Serializable { @Length(min = 1, max = 50, message = "") @Column(name = "namaExternal") protected String namaExternal; - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterJadwalDokter.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterJadwalDokter.java deleted file mode 100644 index 89ba16b1..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterJadwalDokter.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author Adik - */ -@MappedSuperclass -public class BaseMasterJadwalDokter extends BaseActive implements Serializable { - - /** - * - */ -// private static final long serialVersionUID = -7522287859244078391L; - - @Id - @GeneratedValue( - strategy=GenerationType.SEQUENCE, - generator="public.jadwaldokter_m_id_seq") - @javax.persistence.SequenceGenerator( - name="public.jadwaldokter_m_id_seq", - sequenceName="public.jadwaldokter_m_id_seq", - allocationSize=1 - ) - @Column(name = "id") - protected Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @GeneratedValue(generator = "uuid") - @GenericGenerator(name = "uuid", strategy = "uuid") - @Column(columnDefinition = "CHAR(32)") - private String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - -// public static long getSerialversionuid() { -// return serialVersionUID; -// } - - @Length(min = 1, max = 50, message = "") - @Column(name = "reportDisplay") - protected String reportDisplay; - - @Length(min = 1, max = 15, message = "") - @Column(name = "kodeExternal") - protected String kodeExternal; - - @Length(min = 1, max = 50, message = "") - @Column(name = "namaExternal") - protected String namaExternal; - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPasien.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPasien.java deleted file mode 100644 index 39700c45..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPasien.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author Adik - */ -@MappedSuperclass -public class BaseMasterPasien extends BaseActive implements Serializable { - - /** - * - */ -// private static final long serialVersionUID = -7522287859244078391L; - - @Id - @GeneratedValue( - strategy=GenerationType.SEQUENCE, - generator="public.pasien_m_id_seq") - @javax.persistence.SequenceGenerator( - name="public.pasien_m_id_seq", - sequenceName="public.pasien_m_id_seq", - allocationSize=1 - ) - @Column(name = "id") - protected Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @GeneratedValue(generator = "uuid") - @GenericGenerator(name = "uuid", strategy = "uuid") - @Column(columnDefinition = "CHAR(32)") - private String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - -// public static long getSerialversionuid() { -// return serialVersionUID; -// } - - @Length(min = 1, max = 50, message = "") - @Column(name = "reportDisplay") - protected String reportDisplay; - - @Length(min = 1, max = 15, message = "") - @Column(name = "kodeExternal") - protected String kodeExternal; - - @Length(min = 1, max = 50, message = "") - @Column(name = "namaExternal") - protected String namaExternal; - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPegawai.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPegawai.java deleted file mode 100644 index 909457a6..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterPegawai.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author b4yu4d4 - */ -@MappedSuperclass -public class BaseMasterPegawai extends BaseActive implements Serializable { - - /** - * - */ -// private static final long serialVersionUID = -7522287859244078391L; - - @Id - @GeneratedValue( - strategy=GenerationType.SEQUENCE, - generator="public.pegawai_m_id_seq") - @javax.persistence.SequenceGenerator( - name="public.pegawai_m_id_seq", - sequenceName="public.pegawai_m_id_seq", - allocationSize=1 - ) - @Column(name = "id") - protected Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @GeneratedValue(generator = "uuid") - @GenericGenerator(name = "uuid", strategy = "uuid") - @Column(columnDefinition = "CHAR(32)") - private String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - -// public static long getSerialversionuid() { -// return serialVersionUID; -// } - - @Length(min = 1, max = 50, message = "") - @Column(name = "reportDisplay") - protected String reportDisplay; - - @Length(min = 1, max = 15, message = "") - @Column(name = "kodeExternal") - protected String kodeExternal; - - @Length(min = 1, max = 50, message = "") - @Column(name = "namaExternal") - protected String namaExternal; - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java deleted file mode 100644 index c582856c..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author Adik - */ -@MappedSuperclass -public class BaseMasterProduk extends BaseActive implements Serializable { - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.produk_m_id_seq") - @SequenceGenerator(name = "public.produk_m_id_seq", sequenceName = "public.produk_m_id_seq", allocationSize = 1) - @Column(name = "id") - protected Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @GeneratedValue(generator = "uuid") - @GenericGenerator(name = "uuid", strategy = "uuid") - @Column(columnDefinition = "CHAR(32)") - private String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - - @Length(min = 1, max = 50, message = "") - @Column(name = "reportDisplay") - protected String reportDisplay; - - @Length(min = 1, max = 15, message = "") - @Column(name = "kodeExternal") - protected String kodeExternal; - - @Length(min = 1, max = 50, message = "") - @Column(name = "namaExternal") - protected String namaExternal; - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterStokProdukGlobal.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterStokProdukGlobal.java deleted file mode 100644 index a4f8e1fa..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterStokProdukGlobal.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.jasamedika.medifirst2000.base; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.validator.constraints.Length; - -/** - * Base class for all entities, but using String idString as 'id' - * - * @author Adik - */ -@MappedSuperclass -public class BaseMasterStokProdukGlobal extends BaseActive implements Serializable { - - /** - * - */ -// private static final long serialVersionUID = -7522287859244078391L; - - @Id - @GeneratedValue( - strategy=GenerationType.SEQUENCE, - generator="public.stokprodukglobal_m_id_seq") - @javax.persistence.SequenceGenerator( - name="public.stokprodukglobal_m_id_seq", - sequenceName="public.stokprodukglobal_m_id_seq", - allocationSize=1 - ) - @Column(name = "id") - protected Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @GeneratedValue(generator = "uuid") - @GenericGenerator(name = "uuid", strategy = "uuid") - @Column(columnDefinition = "CHAR(32)") - private String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - -// public static long getSerialversionuid() { -// return serialVersionUID; -// } - - @Length(min = 1, max = 50, message = "") - @Column(name = "reportDisplay") - protected String reportDisplay; - - @Length(min = 1, max = 15, message = "") - @Column(name = "kodeExternal") - protected String kodeExternal; - - @Length(min = 1, max = 50, message = "") - @Column(name = "namaExternal") - protected String namaExternal; - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java index c92a27f6..5264c0d6 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java @@ -1,65 +1,42 @@ package com.jasamedika.medifirst2000.base; -import java.io.Serializable; -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.JsonUtil; +import lombok.extern.slf4j.Slf4j; +import org.hibernate.proxy.HibernateProxy; import javax.persistence.Column; import javax.persistence.JoinColumn; import javax.persistence.MappedSuperclass; import javax.persistence.OneToMany; - -import org.hibernate.proxy.HibernateProxy; - -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.util.CommonUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; +import java.io.Serializable; +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.Field; +import java.util.*; /** * * @author Adik */ -@SuppressWarnings("serial") @MappedSuperclass +@Slf4j public abstract class BaseModel implements Serializable { public Map ToSingleMap() throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); + Map maps = new HashMap<>(); for (Field field : BaseModel.GetFields(this.getClass())) { String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - } - if (valid == false) + boolean valid = isValidItem(field); + if (!valid) maps.put(field.getName(), field.get(this)); - } return maps; } @@ -69,145 +46,99 @@ public abstract class BaseModel implements Serializable { } public Map ToMap(Integer index) throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); + Map maps = new HashMap<>(); for (Field field : BaseModel.GetFields(this.getClass())) { String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - } - if (valid == false && field.get(this) != null) + boolean valid = isValidItem(field); + if (!valid && field.get(this) != null) maps.put(field.getName(), field.get(this)); - } if (index > 1) for (Field field : BaseModel.GetFields(this.getClass())) { String str = field.getName(); String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "_filter_signature": + case "handler": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; + } + boolean valid = false; for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { if (annotation instanceof JoinColumn) { valid = true; } else if (annotation instanceof Column) { Column column = (Column) annotation; if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) + if (!field.getName().endsWith("Id")) valid = true; } else if (annotation instanceof OneToMany) { - valid = true; } - if (valid == true) { + if (valid) { Object property = field.get(this); - - if (property == null) { - // do when property is null - } else { - - if (property instanceof HibernateProxy) { + if (property != null) { + if (property instanceof HibernateProxy) property = JsonUtil.initializeAndUnproxy(property); - } if (property instanceof BaseModel) { - Map mapItems = new HashMap(); + Map mapItems = new HashMap<>(); for (Field fieldItem : BaseModel.GetFields(property.getClass())) { String nameItem = fieldItem.getName(); fieldItem.setAccessible(true); - if (nameItem.equals("serialVersionUID")) + switch (nameItem) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (nameItem.equals("_methods_")) - continue; - if (nameItem.equals("handler")) - continue; - if (nameItem.equals("_filter_signature")) - continue; - Boolean validItem = false; - for (java.lang.annotation.Annotation annotationItem : fieldItem - .getDeclaredAnnotations()) { - if (annotationItem instanceof JoinColumn) { - validItem = true; - } else if (annotationItem instanceof Column) { - Column columnItem = (Column) annotationItem; - if (columnItem.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - validItem = true; - } else if (annotationItem instanceof OneToMany) { - - validItem = true; - } } - if (validItem == false && fieldItem.get(property) != null) { + boolean validItem = isValidItem(fieldItem); + if (!validItem && fieldItem.get(property) != null) mapItems.put(fieldItem.getName(), fieldItem.get(property)); - } } maps.put(str, mapItems); } - } - } } } - return maps; } + private static boolean isValidItem(Field fieldItem) { + boolean validItem = false; + for (java.lang.annotation.Annotation annotationItem : fieldItem.getDeclaredAnnotations()) { + if (annotationItem instanceof JoinColumn) { + validItem = true; + } else if (annotationItem instanceof Column) { + Column columnItem = (Column) annotationItem; + if (columnItem.name().endsWith("Fk")) + if (!fieldItem.getName().endsWith("Id")) + validItem = true; + } else if (annotationItem instanceof OneToMany) { + validItem = true; + } + } + return validItem; + } + @SuppressWarnings("rawtypes") public static List GetFields(Class data) { - List items = new ArrayList(); + 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; - } - - 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); - } + if (parent != null) + items.addAll(GetFields(data.getSuperclass())); + items.addAll(Arrays.asList(data.getDeclaredFields())); return items; } @@ -222,36 +153,29 @@ public abstract class BaseModel implements Serializable { try { cl = Class.forName(name); } catch (ClassNotFoundException e) { - e.printStackTrace(); + log.error(e.getMessage()); } - Map fields = new HashMap(); - if (CommonUtil.isNotNullOrEmpty(cl)) { + Map fields = new HashMap<>(); + if (CommonUtil.isNotNullOrEmpty(cl) && cl != null) { for (Object f : GetFields(cl).toArray()) { - if (!getName(((Field) f).getType().toString()).equalsIgnoreCase("Set")) { - if (f instanceof Field) { - ((AccessibleObject) f).setAccessible(true); - boolean found = false; - if (CommonUtil.isNotNullOrEmpty(fieldsToInclude)) { - for (String element : fieldsToInclude) { - if (((Field) f).getName().equals(element)) { - found = true; - break; - } + ((AccessibleObject) f).setAccessible(true); + boolean found = false; + if (CommonUtil.isNotNullOrEmpty(fieldsToInclude)) { + for (String element : fieldsToInclude) { + if (((Field) f).getName().equals(element)) { + found = true; + break; } - } else { - found = true; - } - - if (found) { - fields.put(((Field) f).getName(), ((Field) f).get(this)); } + } else { + found = true; } + if (found) + fields.put(((Field) f).getName(), ((Field) f).get(this)); } } } - return fields; } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseProfile.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseProfile.java index fae2aa19..6f7dde5f 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseProfile.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseProfile.java @@ -1,6 +1,7 @@ package com.jasamedika.medifirst2000.base; -import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -10,18 +11,11 @@ import javax.persistence.MappedSuperclass; * * @author Adik */ +@Getter +@Setter @MappedSuperclass -public abstract class BaseProfile extends BaseModel implements Serializable { +public abstract class BaseProfile extends BaseModel { @Column(name = "kdProfile") - public Short kdProfile; - - public Short getKdProfile() { - return kdProfile; - } - - public void setKdProfile(Short kdProfile) { - this.kdProfile = kdProfile; - } - + protected Short kdProfile; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseTransaction.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseTransaction.java index 0080901a..1f606384 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseTransaction.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseTransaction.java @@ -1,34 +1,25 @@ package com.jasamedika.medifirst2000.base; -import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.GenericGenerator; import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.MappedSuperclass; -import org.hibernate.annotations.GenericGenerator; - /** * @author Andri */ -@MappedSuperclass -public abstract class BaseTransaction extends BaseActive implements Serializable { - +@Getter +@Setter +@MappedSuperclass +public abstract class BaseTransaction extends BaseActive { + @GeneratedValue(generator = "uuid") - @GenericGenerator(name = "uuid", strategy = "uuid") - @Column(columnDefinition = "CHAR(32)", unique = true) - @Id - public String noRec; - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - - - + @GenericGenerator(name = "uuid", strategy = "uuid") + @Column(columnDefinition = "CHAR(32)", unique = true) + @Id + protected String noRec; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseActiveVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseActiveVO.java index 48e480b6..c927a29e 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseActiveVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseActiveVO.java @@ -1,26 +1,16 @@ package com.jasamedika.medifirst2000.base.vo; -import javax.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.Setter; /** * Base Action VO class * * @author Adik */ -@MappedSuperclass +@Getter +@Setter public abstract class BaseActiveVO extends BaseProfileVO { protected Boolean statusEnabled; - - public BaseActiveVO() { - } - - public Boolean getStatusEnabled() { - return statusEnabled; - } - - public void setStatusEnabled(Boolean statusEnabled) { - this.statusEnabled = statusEnabled; - } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMappingVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMappingVO.java deleted file mode 100644 index b270cfc7..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMappingVO.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jasamedika.medifirst2000.base.vo; - - /** - * @author Andri - */ -public abstract class BaseMappingVO extends BaseProfileVO { - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java index 3d447d4b..84a7254d 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java @@ -1,61 +1,20 @@ package com.jasamedika.medifirst2000.base.vo; -import javax.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.Setter; /** * Base Master VO class * * @author Adik */ -@MappedSuperclass +@Getter +@Setter public abstract class BaseMasterVO extends BaseActiveVO { + protected Integer id; protected String noRec; protected String reportDisplay; protected String kodeExternal; protected String namaExternal; - - public BaseMasterVO() { - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - - public String getReportDisplay() { - return reportDisplay; - } - - public void setReportDisplay(String reportDisplay) { - this.reportDisplay = reportDisplay; - } - - public String getKodeExternal() { - return kodeExternal; - } - - public void setKodeExternal(String kodeExternal) { - this.kodeExternal = kodeExternal; - } - - public String getNamaExternal() { - return namaExternal; - } - - public void setNamaExternal(String namaExternal) { - this.namaExternal = namaExternal; - } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseModelVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseModelVO.java index 76b98b34..357e3ba0 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseModelVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseModelVO.java @@ -1,409 +1,98 @@ package com.jasamedika.medifirst2000.base.vo; +import com.jasamedika.medifirst2000.util.CommonUtil; +import lombok.extern.slf4j.Slf4j; + import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; - -import org.hibernate.proxy.HibernateProxy; - -import com.jasamedika.medifirst2000.base.BaseMaster; -import com.jasamedika.medifirst2000.base.BaseModel; -import com.jasamedika.medifirst2000.base.BaseTransaction; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.JsonUtil; +import java.util.*; /** * Base VO class for all entities, for exposing data as JSON Object * * @author Roberto */ -@MappedSuperclass +@Slf4j public abstract class BaseModelVO { public Map ToSingleMap() throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); - List fieldsToInclude = new ArrayList(); - for (Field field : this.GetFields(this.getClass())) { - String str = field.getName(); + Map maps = new HashMap<>(); + for (Field field : GetFields(this.getClass())) { String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - } - if (valid == false) + boolean valid = false; + if (!valid) maps.put(field.getName(), field.get(this)); - } return maps; } - public Map ToMap(Integer index) throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); - List fieldsToInclude = new ArrayList(); - for (Field field : this.GetFields(this.getClass())) { - String str = field.getName(); - String name = field.getName(); - field.setAccessible(true); - if (name.equals("serialVersionUID")) - continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - valid = true; - } - - } - if (valid == false && field.get(this)!=null) - maps.put(field.getName(), field.get(this)); - - } - if(index>1) - for (Field field : this.GetFields(this.getClass())) { - String str = field.getName(); - String name = field.getName(); - field.setAccessible(true); - if (name.equals("serialVersionUID")) - continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - if (valid == true) { - Object property = field.get(this); - - if (property == null) - { - //maps.put(str, null); - - } - else { - - if(property instanceof HibernateProxy) - { - property = JsonUtil.initializeAndUnproxy(property); - } - if (property instanceof BaseModel) { - Map mapItems = new HashMap(); - for (Field fieldItem : ((BaseModel) property).GetFields(property.getClass())) { - String strItem = fieldItem.getName(); - String nameItem = fieldItem.getName(); - fieldItem.setAccessible(true); - if (nameItem.equals("serialVersionUID")) - continue; - if (nameItem.equals("_methods_")) - continue; - if (nameItem.equals("handler")) - continue; - if (nameItem.equals("_filter_signature")) - continue; - Boolean validItem = false; - for (java.lang.annotation.Annotation annotationItem : fieldItem - .getDeclaredAnnotations()) { - if (annotationItem instanceof JoinColumn) { - validItem = true; - } else if (annotationItem instanceof Column) { - Column columnItem = (Column) annotationItem; - if (columnItem.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - validItem = true; - } else if (annotationItem instanceof OneToMany) { - - validItem = true; - } - } - if (validItem == false && fieldItem.get(property)!=null) { - mapItems.put(fieldItem.getName(), fieldItem.get(property)); - } - } - maps.put(str, mapItems); - } - - } - - } - } - } - - return maps; - } public Map ToMap() throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); - List fieldsToInclude = new ArrayList(); - for (Field field : this.GetFields(this.getClass())) { - String str = field.getName(); + Map maps = new HashMap<>(); + for (Field field : GetFields(this.getClass())) { String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - } - if (valid == false && field.get(this)!=null) + boolean valid = false; + if (!valid && field.get(this) != null) maps.put(field.getName(), field.get(this)); - } - for (Field field : this.GetFields(this.getClass())) { - String str = field.getName(); - String name = field.getName(); - field.setAccessible(true); - if (name.equals("serialVersionUID")) - continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - if (valid == true) { - Object property = field.get(this); - - if (property == null) - { - //maps.put(str, null); - - } - else { - if (property instanceof BaseModelVO) { - Map mapItems = new HashMap(); - for (Field fieldItem : ((BaseModelVO) property).GetFields(property.getClass())) { - String strItem = fieldItem.getName(); - String nameItem = fieldItem.getName(); - fieldItem.setAccessible(true); - if (nameItem.equals("serialVersionUID")) - continue; - if (nameItem.equals("_methods_")) - continue; - if (nameItem.equals("handler")) - continue; - if (nameItem.equals("_filter_signature")) - continue; - Boolean validItem = false; - for (java.lang.annotation.Annotation annotationItem : fieldItem - .getDeclaredAnnotations()) { - if (annotationItem instanceof JoinColumn) { - validItem = true; - } else if (annotationItem instanceof Column) { - Column columnItem = (Column) annotationItem; - if (columnItem.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - validItem = true; - } else if (annotationItem instanceof OneToMany) { - - validItem = true; - } - } - if (validItem == false && fieldItem.get(property)!=null) { - mapItems.put(fieldItem.getName(), fieldItem.get(property)); - } - } - maps.put(str, mapItems); - } - else - if(property instanceof BaseTransactionVO) - { - Map mapItems = new HashMap(); - for (Field fieldItem : ((BaseTransactionVO) property).GetFields(property.getClass())) { - String strItem = fieldItem.getName(); - String nameItem = fieldItem.getName(); - fieldItem.setAccessible(true); - if (nameItem.equals("serialVersionUID")) - continue; - if (nameItem.equals("_methods_")) - continue; - if (nameItem.equals("handler")) - continue; - if (nameItem.equals("_filter_signature")) - continue; - Boolean validItem = false; - for (java.lang.annotation.Annotation annotationItem : fieldItem - .getDeclaredAnnotations()) { - if (annotationItem instanceof JoinColumn) { - validItem = true; - } else if (annotationItem instanceof Column) { - Column columnItem = (Column) annotationItem; - if (columnItem.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - validItem = true; - } else if (annotationItem instanceof OneToMany) { - - validItem = true; - } - } - if (validItem == false && fieldItem.get(property)!=null) { - mapItems.put(fieldItem.getName(), fieldItem.get(property)); - } - } - maps.put(str, mapItems); - } - - } - - } - } - } - return maps; } - public static List GetFields(Class data) { - List items = new ArrayList(); - String name = data.getName(); - Class parent = data.getSuperclass(); - if (parent instanceof Class) { - name = ((Class) parent).getName(); - } - - Class tmpClass = null; - if (BaseModelVO.class.isAssignableFrom(data.getClass())) { - tmpClass = BaseTransaction.class; - } else if (BaseTransaction.class.isAssignableFrom(data.getClass())) { - tmpClass = BaseMaster.class; - } - - 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; } public Map serialize(String[] fieldsToInclude, String className) throws Exception { - //return ToMap(); - String name = "com.jasamedika.medifirst2000.vo." + getName(className); - Class cl = null; - Object o = null; - try { - cl = Class.forName(name); - o = cl.newInstance(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - Map fields = new HashMap(); - for (Object f : GetFields(cl).toArray()) { - if (f instanceof Field) { - ((AccessibleObject) f).setAccessible(true); - boolean found = false; - if (CommonUtil.isNotNullOrEmpty(fieldsToInclude)) { - for (String element : fieldsToInclude) { - if (((Field) f).getName().equals(element)) - { - found = true; - break; - } - } - } else { - found = true; - } - - if (found) { - fields.put(((Field) f).getName(), ((Field) f).get(this)); - } - } - } - return fields; + String name = "com.jasamedika.medifirst2000.vo." + getName(className); + Class cl = null; + try { + cl = Class.forName(name); + } catch (ClassNotFoundException e) { + log.error(e.getMessage()); + } + Map fields = new HashMap<>(); + if (CommonUtil.isNotNullOrEmpty(cl) && cl != null) { + for (Object f : GetFields(cl).toArray()) { + if (f instanceof Field) { + ((AccessibleObject) f).setAccessible(true); + boolean found = false; + if (CommonUtil.isNotNullOrEmpty(fieldsToInclude)) { + for (String element : fieldsToInclude) { + if (((Field) f).getName().equals(element)) { + found = true; + break; + } + } + } else { + found = true; + } + if (found) { + fields.put(((Field) f).getName(), ((Field) f).get(this)); + } + } + } + } + return fields; } public String getName(String value) { diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseProfileVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseProfileVO.java index 0b143b6e..3abe805c 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseProfileVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseProfileVO.java @@ -1,26 +1,16 @@ package com.jasamedika.medifirst2000.base.vo; -import javax.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.Setter; /** * Base Profile VO class * * @author Adik */ -@MappedSuperclass -public class BaseProfileVO extends BaseModelVO { - - public Short kdProfile; - - public BaseProfileVO() { - } - - public Short getKdProfile() { - return kdProfile; - } - - public void setKdProfile(Short kdProfile) { - this.kdProfile = kdProfile; - } +@Getter +@Setter +public abstract class BaseProfileVO extends BaseModelVO { + protected Short kdProfile; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseTransactionVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseTransactionVO.java index 458a100b..809651b0 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseTransactionVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseTransactionVO.java @@ -1,25 +1,14 @@ package com.jasamedika.medifirst2000.base.vo; -import javax.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.Setter; /** * @author Andri */ -@MappedSuperclass +@Getter +@Setter public abstract class BaseTransactionVO extends BaseActiveVO { protected String noRec; - - public BaseTransactionVO() { - - } - - public String getNoRec() { - return noRec; - } - - public void setNoRec(String noRec) { - this.noRec = noRec; - } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseVO.java deleted file mode 100644 index 589b8815..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jasamedika.medifirst2000.base.vo; - -/** - * Base VO class for all entities, for exposing data as JSON Object - * - * @author Roberto - */ -public class BaseVO { - protected String id; - - public BaseVO(String id) { - super(); - this.id = id; - } - - public BaseVO() { - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/FieldErrorVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/FieldErrorVO.java index 6cab885a..c52f2e73 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/FieldErrorVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/FieldErrorVO.java @@ -1,27 +1,17 @@ package com.jasamedika.medifirst2000.base.vo.validation; +import lombok.AllArgsConstructor; +import lombok.Getter; /** * VO which contains the information of a single validation error. * * @author Roberto */ +@Getter +@AllArgsConstructor public class FieldErrorVO { + private String field; - private String message; - - public FieldErrorVO(String field, String message) { - this.field = field; - this.message = message; - } - - public String getField() { - return field; - } - - public String getMessage() { - return message; - } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/ValidationErrorVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/ValidationErrorVO.java index a0baa995..d9c2d4e9 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/ValidationErrorVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/validation/ValidationErrorVO.java @@ -1,5 +1,8 @@ package com.jasamedika.medifirst2000.base.vo.validation; +import lombok.Getter; +import lombok.NoArgsConstructor; + import java.util.ArrayList; import java.util.List; @@ -8,19 +11,14 @@ import java.util.List; * * @author Roberto */ +@Getter +@NoArgsConstructor public class ValidationErrorVO { - private List fieldErrors = new ArrayList(); - public ValidationErrorVO() { - - } + private final List fieldErrors = new ArrayList<>(); public void addFieldError(String path, String message) { FieldErrorVO error = new FieldErrorVO(path, message); fieldErrors.add(error); } - - public List getFieldErrors() { - return fieldErrors; - } } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/core/web/WebConstants.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/core/web/WebConstants.java index e7fa1d31..514ef273 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/core/web/WebConstants.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/core/web/WebConstants.java @@ -1,6 +1,7 @@ package com.jasamedika.medifirst2000.core.web; public class WebConstants { + public static final class PageParameter { public static final String LIST_DATA = "listData"; public static final String TOTAL_PAGES = "totalPages"; @@ -18,6 +19,5 @@ public class WebConstants { public static final String MESSAGE = "Message"; } - // HEADER KEY TOKEN public static final String AUTH_HEADER_NAME = "X-AUTH-TOKEN"; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/MetodeHargaEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/MetodeHargaEnum.java deleted file mode 100644 index c03df6bc..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/MetodeHargaEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jasamedika.medifirst2000.enums; - -public enum MetodeHargaEnum { - - BARU("BARU"), - LAMA("LAMA"); - - private String val; - - MetodeHargaEnum(String val) { - this.val = val; - } - - public String getVal() { - return val; - }} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/Status.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/Status.java index 8a1caed6..7aae38a2 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/Status.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/Status.java @@ -1,18 +1,14 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum Status { TERSEDIA("Tersedia"), ORDER("ORDER"), DIPAKAI("DIPAKAI"), SELESAI("SELESAI"), TERISI("Terisi"), CHECKOUT( "Checkout"), MENINGGAL("Meninggal"); - private String val; - - Status(String val) { - this.val = val; - } - - public String getVal() { - return val; - } - + private final String val; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAnggaran.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAnggaran.java deleted file mode 100644 index 52d6ad8d..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAnggaran.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jasamedika.medifirst2000.enums; - -public enum StatusAnggaran { - -// PENGAJUAN("0"), VERIFIKASI_PPK("1"), VERIFIKASI_PENGENDALI("2"), VERIFIKASI_ULP("3"), VERIFIKASI_ANGGARAN( -// "4"), VERIFIKASI_PP("5"); - - INDIKATIF("0"),DEFINITIF("1"); - - private String val; - - StatusAnggaran(String val) { - this.val = val; - } - - public String getVal() { - return val; - } - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAntrianEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAntrianEnum.java index 40572fb5..f3967ff6 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAntrianEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusAntrianEnum.java @@ -1,31 +1,16 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum StatusAntrianEnum { - - MENUNGGU("0"), - DIPANGGIL_SUSTER("1"), - DIPANGGIL_DOKTER("2"), - SELESAI_DIPERIKSA("3"), - PERSIAPAN("4"), - PERIKSA("5"), - SELESAI_HASIL("7"), - AMBIIL_HASIL("8"), - HASIL("6"), - SAMPLE_DI_AMBIL("9"), - SAMPLE_DI_TERIMA("10"), - SAMPLE_DI_VERIFIKASI("11"), - VALIDASI("12"), - STATUS_CETAK("13"), - VALIDASI_ANALIS("14"), - MASUK_KAMAR("15"); - - private String val; - StatusAntrianEnum(String val) { - this.val = val; - } - - public String getVal() { - return val; - }} + MENUNGGU("0"), DIPANGGIL_SUSTER("1"), DIPANGGIL_DOKTER("2"), SELESAI_DIPERIKSA("3"), PERSIAPAN("4"), PERIKSA( + "5"), SELESAI_HASIL("7"), AMBIIL_HASIL("8"), HASIL("6"), SAMPLE_DI_AMBIL( + "9"), SAMPLE_DI_TERIMA("10"), SAMPLE_DI_VERIFIKASI( + "11"), VALIDASI("12"), STATUS_CETAK("13"), VALIDASI_ANALIS("14"), MASUK_KAMAR("15"); + private final String val; +} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusCodeEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusCodeEnum.java deleted file mode 100644 index a3dd9286..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusCodeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jasamedika.medifirst2000.enums; - -public enum StatusCodeEnum { - - BARU("BARU"), - LAMA("LAMA"); - - private String val; - - StatusCodeEnum(String val) { - this.val = val; - } - - public String getVal() { - return val; - }} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusGiziEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusGiziEnum.java index 4ccbf76c..a33eac8e 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusGiziEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusGiziEnum.java @@ -1,21 +1,13 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum StatusGiziEnum { - - MENUNGGU("0"), - VERIFIKASI("1"), - PESAN_BAHAN("2"), - PRODUKSI("3"), - KIRIM_MENU("4"), - ; - - private String val; - StatusGiziEnum(String val) { - this.val = val; - } - - public String getVal() { - return val; - }} + MENUNGGU("0"), VERIFIKASI("1"), PESAN_BAHAN("2"), PRODUKSI("3"), KIRIM_MENU("4"); + private final String val; +} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusKunjunganEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusKunjunganEnum.java index ab6664dd..2cb8cb39 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusKunjunganEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusKunjunganEnum.java @@ -1,16 +1,13 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum StatusKunjunganEnum { - - BARU("BARU"), - LAMA("LAMA"); - - private String val; - StatusKunjunganEnum(String val) { - this.val = val; - } + BARU("BARU"), LAMA("LAMA"); - public String getVal() { - return val; - }} + private final String val; +} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusNegPosEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusNegPosEnum.java index 1adc676d..c4518665 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusNegPosEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusNegPosEnum.java @@ -1,17 +1,13 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum StatusNegPosEnum { - - NEG("NEG"), - POS("POS"); - - private String val; - StatusNegPosEnum(String val) { - this.val = val; - } + NEG("NEG"), POS("POS"); - public String getVal() { - return val; - } + private final String val; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusPenyakitEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusPenyakitEnum.java index 88cadfce..6af9223a 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusPenyakitEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/StatusPenyakitEnum.java @@ -1,16 +1,13 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum StatusPenyakitEnum { - - BARU("BARU"), - LAMA("LAMA"); - - private String val; - StatusPenyakitEnum(String val) { - this.val = val; - } + BARU("BARU"), LAMA("LAMA"); - public String getVal() { - return val; - }} + private final String val; +} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/TipePasienEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/TipePasienEnum.java index aa1074a5..a613f2c1 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/TipePasienEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/TipePasienEnum.java @@ -1,16 +1,13 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum TipePasienEnum { - - BARU("BARU"), - LAMA("LAMA"); - - private String val; - TipePasienEnum(String val) { - this.val = val; - } + BARU("BARU"), LAMA("LAMA"); - public String getVal() { - return val; - }} + private final String val; +} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/VerifikasiEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/VerifikasiEnum.java index 045856eb..74c53179 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/VerifikasiEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/VerifikasiEnum.java @@ -1,32 +1,20 @@ package com.jasamedika.medifirst2000.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum VerifikasiEnum { - - - VERIFIKASI_PEA("VERIFIKASI_PEA"), - VERIFIKASI_DIREKSI("VERIFIKASI_DIREKSI"), - PENGAJUAN("PENGAJUAN"), - VERIFIKASI_PENGENDALI("VERIFIKASI_PENGENDALI"), - UNVERIFIKASI_PENGENDALI("UNVERIFIKASI_PENGENDALI"), - - VERIF_SPPB_PPK("VERIFIKASI_PPK"), - UNVERIF_SPPB_PPK("UNVERIFIKASI_PPK"), - NEW_SPPB("SPPB_BARU"), - - VERIF_PENGENDALI("VERIFIKASI_PENGENDALI"), - VERIF_ANGGARAN("VERIFIKASI_ANGGARAN"), - VERIF_DIREKTUR("VERIFIKASI_DIREKTUR"), - VERIF_PP("VERIFIKASI_PP"), - VERIF_ULP("VERIFIKASI_ULP"), - VERIF_PPK("VERIFIKASI_PPK"), - VERIFIKASI("VERIFIKASI"); - - private String val; - VerifikasiEnum(String val) { - this.val = val; - } + VERIFIKASI_PEA("VERIFIKASI_PEA"), VERIFIKASI_DIREKSI("VERIFIKASI_DIREKSI"), PENGAJUAN( + "PENGAJUAN"), VERIFIKASI_PENGENDALI("VERIFIKASI_PENGENDALI"), UNVERIFIKASI_PENGENDALI( + "UNVERIFIKASI_PENGENDALI"), VERIF_SPPB_PPK("VERIFIKASI_PPK"), UNVERIF_SPPB_PPK( + "UNVERIFIKASI_PPK"), NEW_SPPB("SPPB_BARU"), VERIF_PENGENDALI( + "VERIFIKASI_PENGENDALI"), VERIF_ANGGARAN( + "VERIFIKASI_ANGGARAN"), VERIF_DIREKTUR("VERIFIKASI_DIREKTUR"), VERIF_PP( + "VERIFIKASI_PP"), VERIF_ULP("VERIFIKASI_ULP"), VERIF_PPK( + "VERIFIKASI_PPK"), VERIFIKASI("VERIFIKASI"); - public String getVal() { - return val; - }} + private final String val; +} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/helper/EmailCustomAnnotation.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/helper/EmailCustomAnnotation.java deleted file mode 100644 index 63a272af..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/helper/EmailCustomAnnotation.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jasamedika.medifirst2000.helper; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -@Caption -public @interface EmailCustomAnnotation { - -} \ No newline at end of file diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Age.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Age.java index 6a87365e..ca602c01 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Age.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Age.java @@ -1,30 +1,15 @@ package com.jasamedika.medifirst2000.util; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.ToString; + +@Getter +@AllArgsConstructor +@ToString public class Age { + private int days; private int months; private int years; - - public Age(int days, int months, int years) { - this.days = days; - this.months = months; - this.years = years; - } - - public int getDays() { - return this.days; - } - - public int getMonths() { - return this.months; - } - - public int getYears() { - return this.years; - } - - @Override - public String toString() { - return years + " th, " + months + " bln, " + days + " hr"; - } } \ No newline at end of file diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/AgeCalculator.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/AgeCalculator.java index f7e136e5..c517cc0c 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/AgeCalculator.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/AgeCalculator.java @@ -1,86 +1,69 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; + import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.Period; import java.util.Calendar; import java.util.Date; +@NoArgsConstructor public final class AgeCalculator { - public AgeCalculator() { - - } public static Age calculateAge(Date birthDate) { - Age age = null; - if(CommonUtil.isNotNullOrEmpty(birthDate)) { + if (CommonUtil.isNotNullOrEmpty(birthDate)) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); LocalDate today = LocalDate.now(); - LocalDate birthday = LocalDate.parse(format.format(birthDate)); - Period period = Period.between(birthday, today); - if(CommonUtil.isNotNullOrEmpty(period)) { - age = new Age(period.getDays(), period.getMonths(), period.getYears()); - } + LocalDate birthday = LocalDate.parse(format.format(birthDate)); + Period period = Period.between(birthday, today); + if (CommonUtil.isNotNullOrEmpty(period)) + return new Age(period.getDays(), period.getMonths(), period.getYears()); } - return age; + return null; } - - public static Age calculateAge2(final Date tglRegistrasi,final Date birthDate) { - int years = 0; - int months = 0; + + public static Age calculateAge2(final Date tglRegistrasi, final Date birthDate) { + int years; + int months; int days = 0; - try - { - // create calendar object for birth day - Calendar birthDay = Calendar.getInstance(); - birthDay.setTimeInMillis(birthDate.getTime()); - // create calendar object for current day -// long currentTime = System.currentTimeMillis(); -// Calendar now = Calendar.getInstance(); -// now.setTimeInMillis(currentTime); - Calendar regDay = Calendar.getInstance(); - regDay.setTimeInMillis(tglRegistrasi.getTime()); - // Get difference between years - years = regDay.get(Calendar.YEAR) - birthDay.get(Calendar.YEAR); - int currMonth = regDay.get(Calendar.MONTH) + 1; - int birthMonth = birthDay.get(Calendar.MONTH) + 1; - // Get difference between months - months = currMonth - birthMonth; - // if month difference is in negative then reduce years by one and - // calculate the number of months. - if (months < 0) { - years--; - months = 12 - birthMonth + currMonth; - if (regDay.get(Calendar.DATE) < birthDay.get(Calendar.DATE)) - months--; - } else if (months == 0 - && regDay.get(Calendar.DATE) < birthDay.get(Calendar.DATE)) { - years--; - months = 11; - } - // Calculate the days - if (regDay.get(Calendar.DATE) > birthDay.get(Calendar.DATE)) - days = regDay.get(Calendar.DATE) - birthDay.get(Calendar.DATE); - else if (regDay.get(Calendar.DATE) < birthDay.get(Calendar.DATE)) { - int today = regDay.get(Calendar.DAY_OF_MONTH); - regDay.add(Calendar.MONTH, -1); - days = regDay.getActualMaximum(Calendar.DAY_OF_MONTH) - - birthDay.get(Calendar.DAY_OF_MONTH) + today; - } else { - days = 0; - if (months == 12) { - years++; - months = 0; - } + // create calendar object for birthday + Calendar birthDay = Calendar.getInstance(); + birthDay.setTimeInMillis(birthDate.getTime()); + // create calendar object for current day + Calendar regDay = Calendar.getInstance(); + regDay.setTimeInMillis(tglRegistrasi.getTime()); + // Get difference between years + years = regDay.get(Calendar.YEAR) - birthDay.get(Calendar.YEAR); + int currMonth = regDay.get(Calendar.MONTH) + 1; + int birthMonth = birthDay.get(Calendar.MONTH) + 1; + // Get difference between months + months = currMonth - birthMonth; + // if month difference is in negative then reduce years by one and + // calculate the number of months. + if (months < 0) { + years--; + months = 12 - birthMonth + currMonth; + if (regDay.get(Calendar.DATE) < birthDay.get(Calendar.DATE)) + months--; + } else if (months == 0 && regDay.get(Calendar.DATE) < birthDay.get(Calendar.DATE)) { + years--; + months = 11; + } + // Calculate the days + if (regDay.get(Calendar.DATE) > birthDay.get(Calendar.DATE)) + days = regDay.get(Calendar.DATE) - birthDay.get(Calendar.DATE); + else if (regDay.get(Calendar.DATE) < birthDay.get(Calendar.DATE)) { + int today = regDay.get(Calendar.DAY_OF_MONTH); + regDay.add(Calendar.MONTH, -1); + days = regDay.getActualMaximum(Calendar.DAY_OF_MONTH) - birthDay.get(Calendar.DAY_OF_MONTH) + today; + } else { + if (months == 12) { + years++; + months = 0; } } - catch(Exception ex) - { - - } - // Create new Age object return new Age(days, months, years); } } - diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Base32Util.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Base32Util.java deleted file mode 100644 index 478c7bda..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/Base32Util.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.jasamedika.medifirst2000.util; - -/** - * The Class Base32. - * - * @author Roberto - */ -public class Base32Util { - private static final char[] BASE32_CODE_ARRAY = "0123456789ABCDEFGHJKMNPQRSTVWXYZ" - .toCharArray(); - - private Base32Util() { - super(); - } - - /** - * Encode the byte[] in Base 32 - * - * @param byteArrayToEncode - * - * @return String - */ - public static String encode(byte[] byteArrayToEncode) { - // Douglas Crockford's Base32 Encoding - // see http://www.crockford.com/wrmg/base32.html - assert byteArrayToEncode != null; - assert byteArrayToEncode.length <= Integer.MAX_VALUE / 8 * 5 - 4; - char[] encodedCharArray = new char[(byteArrayToEncode.length + 4) / 5 * 8]; - int blockPosition = 0, bitPosition = 0; - long decimalValue; - while (blockPosition + 4 < byteArrayToEncode.length) { - decimalValue = (long) (byteArrayToEncode[blockPosition + 0] & 0xff) << 32 - | (long) (byteArrayToEncode[blockPosition + 1] & 0xff) << 24 - | (long) (byteArrayToEncode[blockPosition + 2] & 0xff) << 16 - | (long) (byteArrayToEncode[blockPosition + 3] & 0xff) << 8 - | (byteArrayToEncode[blockPosition + 4] & 0xff); - encodedCharArray[bitPosition + 0] = BASE32_CODE_ARRAY[(int) (decimalValue >> 35) & 0x1f]; - encodedCharArray[bitPosition + 1] = BASE32_CODE_ARRAY[(int) (decimalValue >> 30) & 0x1f]; - encodedCharArray[bitPosition + 2] = BASE32_CODE_ARRAY[(int) (decimalValue >> 25) & 0x1f]; - encodedCharArray[bitPosition + 3] = BASE32_CODE_ARRAY[(int) (decimalValue >> 20) & 0x1f]; - encodedCharArray[bitPosition + 4] = BASE32_CODE_ARRAY[(int) (decimalValue >> 15) & 0x1f]; - encodedCharArray[bitPosition + 5] = BASE32_CODE_ARRAY[(int) (decimalValue >> 10) & 0x1f]; - encodedCharArray[bitPosition + 6] = BASE32_CODE_ARRAY[(int) (decimalValue >> 5) & 0x1f]; - encodedCharArray[bitPosition + 7] = BASE32_CODE_ARRAY[(int) (decimalValue >> 0) & 0x1f]; - blockPosition += 5; - bitPosition += 8; - } - if (blockPosition + 4 == byteArrayToEncode.length) { - decimalValue = (long) (byteArrayToEncode[blockPosition + 0] & 0xff) << 32 - | (long) (byteArrayToEncode[blockPosition + 1] & 0xff) << 24 - | (long) (byteArrayToEncode[blockPosition + 2] & 0xff) << 16 - | (long) (byteArrayToEncode[blockPosition + 3] & 0xff) << 8; - encodedCharArray[bitPosition + 0] = BASE32_CODE_ARRAY[(int) (decimalValue >> 35) & 0x1f]; - encodedCharArray[bitPosition + 1] = BASE32_CODE_ARRAY[(int) (decimalValue >> 30) & 0x1f]; - encodedCharArray[bitPosition + 2] = BASE32_CODE_ARRAY[(int) (decimalValue >> 25) & 0x1f]; - encodedCharArray[bitPosition + 3] = BASE32_CODE_ARRAY[(int) (decimalValue >> 20) & 0x1f]; - encodedCharArray[bitPosition + 4] = BASE32_CODE_ARRAY[(int) (decimalValue >> 15) & 0x1f]; - encodedCharArray[bitPosition + 5] = BASE32_CODE_ARRAY[(int) (decimalValue >> 10) & 0x1f]; - encodedCharArray[bitPosition + 6] = BASE32_CODE_ARRAY[(int) (decimalValue >> 5) & 0x1f]; - encodedCharArray[bitPosition + 7] = 'P'; - } else if (blockPosition + 3 == byteArrayToEncode.length) { - decimalValue = (long) (byteArrayToEncode[blockPosition + 0] & 0xff) << 32 - | (long) (byteArrayToEncode[blockPosition + 1] & 0xff) << 24 - | (long) (byteArrayToEncode[blockPosition + 2] & 0xff) << 16; - encodedCharArray[bitPosition + 0] = BASE32_CODE_ARRAY[(int) (decimalValue >> 35) & 0x1f]; - encodedCharArray[bitPosition + 1] = BASE32_CODE_ARRAY[(int) (decimalValue >> 30) & 0x1f]; - encodedCharArray[bitPosition + 2] = BASE32_CODE_ARRAY[(int) (decimalValue >> 25) & 0x1f]; - encodedCharArray[bitPosition + 3] = BASE32_CODE_ARRAY[(int) (decimalValue >> 20) & 0x1f]; - encodedCharArray[bitPosition + 4] = BASE32_CODE_ARRAY[(int) (decimalValue >> 15) & 0x1f]; - encodedCharArray[bitPosition + 5] = '='; - encodedCharArray[bitPosition + 6] = '='; - encodedCharArray[bitPosition + 7] = '='; - } else if (blockPosition + 2 == byteArrayToEncode.length) { - decimalValue = (long) (byteArrayToEncode[blockPosition + 0] & 0xff) << 32 - | (long) (byteArrayToEncode[blockPosition + 1] & 0xff) << 24; - encodedCharArray[bitPosition + 0] = BASE32_CODE_ARRAY[(int) (decimalValue >> 35) & 0x1f]; - encodedCharArray[bitPosition + 1] = BASE32_CODE_ARRAY[(int) (decimalValue >> 30) & 0x1f]; - encodedCharArray[bitPosition + 2] = BASE32_CODE_ARRAY[(int) (decimalValue >> 25) & 0x1f]; - encodedCharArray[bitPosition + 3] = BASE32_CODE_ARRAY[(int) (decimalValue >> 20) & 0x1f]; - encodedCharArray[bitPosition + 4] = '='; - encodedCharArray[bitPosition + 5] = '='; - encodedCharArray[bitPosition + 6] = '='; - encodedCharArray[bitPosition + 7] = '='; - } else if (blockPosition + 1 == byteArrayToEncode.length) { - decimalValue = (long) (byteArrayToEncode[blockPosition + 0] & 0xff) << 32; - encodedCharArray[bitPosition + 0] = BASE32_CODE_ARRAY[(int) (decimalValue >> 35) & 0x1f]; - encodedCharArray[bitPosition + 1] = BASE32_CODE_ARRAY[(int) (decimalValue >> 30) & 0x1f]; - encodedCharArray[bitPosition + 2] = '='; - encodedCharArray[bitPosition + 3] = '='; - encodedCharArray[bitPosition + 4] = '='; - encodedCharArray[bitPosition + 5] = '='; - encodedCharArray[bitPosition + 6] = '='; - encodedCharArray[bitPosition + 7] = '='; - } - return new String(encodedCharArray); - } -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/BaseModelEnum.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/BaseModelEnum.java similarity index 80% rename from jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/BaseModelEnum.java rename to jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/BaseModelEnum.java index faee7b65..199e73d4 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/enums/BaseModelEnum.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/BaseModelEnum.java @@ -1,4 +1,4 @@ -package com.jasamedika.medifirst2000.enums; +package com.jasamedika.medifirst2000.util; /** * Base class untuk enum tipe dari internal valuenya diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CommonUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CommonUtil.java index 7cdea5e9..bdd4400e 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CommonUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CommonUtil.java @@ -1,32 +1,27 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.util.AbstractMap; import java.util.Collection; import java.util.Date; import java.util.Map; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Common utility class. * * @author Roberto */ +@NoArgsConstructor public final class CommonUtil { /** The Logger. */ private static final Log LOG = LogFactory.getLog(CommonUtil.class); - /** - * To prevent instantiation of a new common util. - */ - private CommonUtil() { - super(); - } - /** * Remove string qualifier used in the scripting code / GUI (client side). * @@ -35,11 +30,9 @@ public final class CommonUtil { * @return An expression without string qualifier (ex: orang.nama) */ public static String trimExpression(String expression) { - if (expression.charAt(0) == '$') { + if (expression.charAt(0) == '$') return expression.substring(2, expression.length() - 1); - } else { - return expression; - } + return expression; } /** @@ -62,7 +55,7 @@ public final class CommonUtil { } else { try { value = PropertyUtils.getProperty(source, property); - } catch (java.lang.Exception e) { + } catch (Exception e) { LOG.error("Error when getting property: " + property + " from source: " + source, e); } } @@ -94,13 +87,11 @@ public final class CommonUtil { * Check whether a string is null. If it is null, an empty string is * returned. Otherwise, the string itself is returned. * - * @param string * @return An empty string or the string itself. */ public static String checkNullString(String string) { - if (string == null) { + if (string == null) return ""; - } return string; } @@ -110,12 +101,10 @@ public final class CommonUtil { * * @param object * Object to convert to String - * @return */ public static String checkNullString(Object object) { - if (object == null) { + if (object == null) return ""; - } return object.toString(); } @@ -123,37 +112,28 @@ public final class CommonUtil { * Check whether an Integer object is null. If it is, Integer 0 is returned. * Otherwise, the Integer object itself is returned. * - * @param integer * @return An Integer object. */ public static Integer checkNullInteger(Integer integer) { - if (integer == null) { - return Integer.valueOf(0); - } + if (integer == null) + return 0; return integer; } /** * Checking whether an object is equal to at least one of the objects given. - * - * @param object - * @param objectsToCompare - * @return + * */ public static boolean checkEquality(Object object, Object... objectsToCompare) { - if (object == null) { + if (object == null) return false; - } - if (objectsToCompare == null || objectsToCompare.length == 0) { + if (objectsToCompare == null || objectsToCompare.length == 0) throw new IllegalArgumentException("ObjectsToCompare cannot be null or empty."); - } for (Object objectToCompare : objectsToCompare) { - if (objectToCompare == null) { + if (objectToCompare == null) continue; - } - if (object.equals(objectToCompare)) { + if (object.equals(objectToCompare)) return true; - } } return false; } @@ -161,23 +141,16 @@ public final class CommonUtil { /** * Checking whether the string is equal ignoring case with at least one of * the string given. - * - * @param string - * @param stringsToCompare - * @return + * */ public static boolean checkEqualityIgnoreCase(String string, String... stringsToCompare) { - if (string == null) { + if (string == null) throw new IllegalArgumentException("String cannot be null."); - } - if (stringsToCompare == null || stringsToCompare.length == 0) { + if (stringsToCompare == null || stringsToCompare.length == 0) throw new IllegalArgumentException("StringsToCompare cannot be null or empty."); - } - for (String stringToCompare : stringsToCompare) { - if (string.equalsIgnoreCase(stringToCompare)) { + for (String stringToCompare : stringsToCompare) + if (string.equalsIgnoreCase(stringToCompare)) return true; - } - } return false; } @@ -187,24 +160,16 @@ public final class CommonUtil { @SuppressWarnings("rawtypes") public static Boolean isNullOrEmpty(Object object) { - if (object == null) { - return true; - } else { + if (object != null) { if (object instanceof Collection) { - if (((Collection) object).isEmpty()) { - return true; - } + return ((Collection) object).isEmpty(); } else if (object instanceof AbstractMap) { - if (((AbstractMap) object).isEmpty()) { - return true; - } + return ((AbstractMap) object).isEmpty(); } else { - if (object.toString().trim().equals("")) { - return true; - } + return object.toString().trim().isEmpty(); } - return false; } + return true; } - + } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CurrencyUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CurrencyUtil.java index b44e1169..0a5147b9 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CurrencyUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/CurrencyUtil.java @@ -1,5 +1,7 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.NumberFormat; @@ -10,76 +12,57 @@ import java.util.Locale; * * @author Roberto */ +@NoArgsConstructor public class CurrencyUtil { - private CurrencyUtil() { - super(); - } - /** - * Display prince in INA * - * - * @param price - * */ + * Display prince in INA + */ public static String getPriceInINA(double price) { - DecimalFormat indonesiaCurrency = (DecimalFormat) DecimalFormat - .getCurrencyInstance(); + DecimalFormat indonesiaCurrency = (DecimalFormat) DecimalFormat.getCurrencyInstance(); DecimalFormatSymbols formatRp = new DecimalFormatSymbols(); - formatRp.setCurrencySymbol("Rp. "); formatRp.setMonetaryDecimalSeparator(','); formatRp.setGroupingSeparator('.'); - indonesiaCurrency.setDecimalFormatSymbols(formatRp); return indonesiaCurrency.format(price); } /** - * Display prince in US Dollar * - * - * @param price - * */ + * Display prince in US Dollar + */ public static String getPriceInUSD(double price) { - NumberFormat currencyFormat = NumberFormat - .getCurrencyInstance(Locale.US); + NumberFormat currencyFormat = NumberFormat.getCurrencyInstance(Locale.US); return currencyFormat.format(price); } /** - * Display prince in British Pound * - * - * @param price - * */ + * Display prince in British Pound + */ public static String getPriceInGBP(double price) { NumberFormat GBP = NumberFormat.getCurrencyInstance(Locale.UK); return GBP.format(price); } /** - * Display prince in EURO using FRANCE* - * - * @param price - * */ + * Display prince in EURO using FRANCE + */ public static String getPriceInEURO(double price) { NumberFormat currency = NumberFormat.getCurrencyInstance(Locale.FRANCE); return currency.format(price); } /** - * Display prince in Japanese Yen * - * - * @param price - * */ + * Display prince in Japanese Yen + */ public static String getPriceInJPY(double price) { NumberFormat currency = NumberFormat.getCurrencyInstance(Locale.JAPAN); return currency.format(price); } /** - * Display prince in Won Korea * - * - * @param price - * */ + * Display prince in Won Korea + */ public static String getPriceInKOREA(double price) { NumberFormat currency = NumberFormat.getCurrencyInstance(Locale.KOREA); return currency.format(price); diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/DateUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/DateUtil.java index a4a80dee..8b6a7abc 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/DateUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/DateUtil.java @@ -1,5 +1,9 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Serializable; import java.text.DateFormat; import java.text.Format; @@ -13,16 +17,15 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * The Class DateUtil. * * @author Roberto */ +@NoArgsConstructor public final class DateUtil implements Serializable { - private final static Logger LOGGER = LoggerFactory.getLogger(DateUtil.class); + + private static final Logger LOGGER = LoggerFactory.getLogger(DateUtil.class); /** The Constant serialVersionUID. */ private static final long serialVersionUID = -3865736292493750177L; @@ -39,33 +42,28 @@ public final class DateUtil implements Serializable { /** The Constant DATE_PATTERN. */ public static final String DATE_PATTERN = "dd-MM-yyyy"; - protected static final String SHORT_DATE_FORMAT_STRING = "dd/MM/yyyy"; - protected static final String LONG_DATE_FORMAT_STRING = "dd MMMMM yyyy"; + private static final String SHORT_DATE_FORMAT_STRING = "dd/MM/yyyy"; + + private static final String LONG_DATE_FORMAT_STRING = "dd MMMMM yyyy"; public static final DateFormat SHORT_DATE_FORMAT = new SimpleDateFormat(SHORT_DATE_FORMAT_STRING); + public static final DateFormat LONG_DATE_FORMAT = new SimpleDateFormat(LONG_DATE_FORMAT_STRING); /** The Constant DATE_FORMAT. */ private static final Format DATE_FORMAT = new SimpleDateFormat(DATE_PATTERN); - private DateUtil() { - // To prevent instantiation of this class. - } - /** * Calculate the beginning date of the month. - * - * @return + * */ public Date getBeginningOfTheMonth(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); - if (calendar.get(Calendar.DAY_OF_MONTH) > 1) { calendar.add(Calendar.MONTH, 1); calendar.set(Calendar.DAY_OF_MONTH, 1); } - return calendar.getTime(); } @@ -73,7 +71,7 @@ public final class DateUtil implements Serializable { * Calculate the age now. * * @param birthDate - * the birth date + * the birthdate * @return the age */ public static int getAge(Date birthDate) { @@ -84,7 +82,7 @@ public final class DateUtil implements Serializable { * Calculate the age on a date. * * @param birthDate - * the birth date + * the birthdate * @param aDate * a date * @return the age @@ -94,9 +92,8 @@ public final class DateUtil implements Serializable { cal.setTime(aDate); Calendar dob = Calendar.getInstance(); dob.setTime(birthDate); - if (dob.after(cal)) { + if (dob.after(cal)) throw new IllegalArgumentException("Date not valid"); - } int year1 = cal.get(Calendar.YEAR); int year2 = dob.get(Calendar.YEAR); int age = year1 - year2; @@ -107,9 +104,8 @@ public final class DateUtil implements Serializable { } else if (month1 == month2) { int day1 = cal.get(Calendar.DAY_OF_MONTH); int day2 = dob.get(Calendar.DAY_OF_MONTH); - if (day2 > day1) { + if (day2 > day1) age--; - } } return age; } @@ -128,9 +124,8 @@ public final class DateUtil implements Serializable { Calendar cal2 = Calendar.getInstance(); cal1.setTime(date1); cal2.setTime(date2); - if (cal2.after(cal1)) { + if (cal2.after(cal1)) throw new IllegalArgumentException("Date not valid"); - } long diff = cal1.getTimeInMillis() - cal2.getTimeInMillis(); int days = (int) (diff / MILLISECONDS_IN_A_DAY); int years = (int) Math.floor(days / 365.24); @@ -152,9 +147,8 @@ public final class DateUtil implements Serializable { * @return Number of days */ public static int getDaysBetweenDates(Date date1, Date date2) { - if (date1 == null || date2 == null) { + if (date1 == null || date2 == null) throw new IllegalArgumentException("One or both dates are null."); - } Calendar cal1 = Calendar.getInstance(); cal1.setTime(date1); cal1.set(Calendar.HOUR_OF_DAY, 0); @@ -180,9 +174,8 @@ public final class DateUtil implements Serializable { * @return The string representation of the date */ public static String formatDate(Date date) { - if (date == null) { + if (date == null) return ""; - } return DATE_FORMAT.format(date); } @@ -223,8 +216,8 @@ public final class DateUtil implements Serializable { */ public static int currentMonth() { Calendar now = Calendar.getInstance(); - // the month in Java is 0-based, but we use 1-based in the application - return now.get(Calendar.MONTH) + 1; + return now.get(Calendar.MONTH) + 1; // the month in Java is 0-based, but + // we use 1-based in the application } /** @@ -243,26 +236,22 @@ public final class DateUtil implements Serializable { return calendar.getTime(); } - public static final synchronized Integer getYearFromDate(Date date) { + public static synchronized Integer getYearFromDate(Date date) { Calendar cal = Calendar.getInstance(); cal.setTime(date); - int year = cal.get(Calendar.YEAR); - - return year; + return cal.get(Calendar.YEAR); } - public static final synchronized Integer getMonthFromDate(Date date) { + public static synchronized Integer getMonthFromDate(Date date) { Calendar cal = Calendar.getInstance(); cal.setTime(date); int year = cal.get(Calendar.MONTH); - return year + 1; } /** * Get year information of a date. * - * @param date * @return the year */ public static int getYear(Date date) { @@ -274,29 +263,23 @@ public final class DateUtil implements Serializable { /** * Create a string for a date with the format "dd/MM/yyyy" * - * @param date * @return formatted date, or an empty string if the date is null. */ public static String formatShortDate(Date date) { - if (date == null) { - return ""; - } else { + if (date != null) return SHORT_DATE_FORMAT.format(date); - } + return ""; } /** * Create a string for a date with the format "dd MMMMM yyyy" * - * @param date * @return formatted date, or an empty string if the date is null. */ public static String formatLongDate(Date date) { - if (date == null) { - return ""; - } else { + if (date != null) return LONG_DATE_FORMAT.format(date); - } + return ""; } /** @@ -305,7 +288,6 @@ public final class DateUtil implements Serializable { * @param dateString * Date string. * @return Date object. - * @throws ParseException */ public static Date parseShortDateString(String dateString) throws ParseException { return SHORT_DATE_FORMAT.parse(dateString); @@ -314,10 +296,9 @@ public final class DateUtil implements Serializable { /** * Parse a long date string ("dd MMMMM yyyy") into a Date object. * - * @param date + * @param dateString * Date string. * @return Date object. - * @throws ParseException */ public static Date parseLongDateString(String dateString) throws ParseException { return LONG_DATE_FORMAT.parse(dateString); @@ -330,7 +311,6 @@ public final class DateUtil implements Serializable { /** * Get String information of a date in Indonesian style : dd-mmmmm-yyy. * - * @param date * @return string */ public static String getIndonesianStringDate(Date date) { @@ -346,8 +326,7 @@ public final class DateUtil implements Serializable { public static synchronized Date toDate(String dateString) { Date result = null; - - if (dateString != null && !dateString.equals("")) { + if (dateString != null && !dateString.isEmpty()) { try { if (dateString.indexOf(":") > 0) result = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(dateString); @@ -357,12 +336,10 @@ public final class DateUtil implements Serializable { else result = new SimpleDateFormat("yyyyMMddHHmmss").parse(dateString); } - } catch (Exception e) { LOGGER.error(e.getMessage()); } } - return result; } @@ -380,9 +357,7 @@ public final class DateUtil implements Serializable { /** * Parse string formatted date (MM-yyyy, e.g: 05-2016) to Java Date. - * - * @param monthDashYear - * @return + * */ public static Date fromExcelDateToDate(String monthDashYear) { SimpleDateFormat formatter = new SimpleDateFormat("MM-yyyy"); @@ -407,13 +382,11 @@ public final class DateUtil implements Serializable { public static Date getFirstLastDateOfMonth(Date date, boolean first) { Calendar cal = Calendar.getInstance(); cal.setTime(date); - if (first) { cal.set(Calendar.DATE, cal.getActualMinimum(Calendar.DATE)); } else { cal.set(Calendar.DATE, cal.getActualMaximum(Calendar.DATE)); } - return cal.getTime(); } @@ -430,8 +403,8 @@ public final class DateUtil implements Serializable { .toInstant()); } - public static Date startMonth(Long milis) { - LocalDate month = new Date(milis).toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + public static Date startMonth(Long millis) { + LocalDate month = new Date(millis).toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); return Date.from(month.with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay().atZone(ZoneId.systemDefault()) .toInstant()); } @@ -495,7 +468,7 @@ public final class DateUtil implements Serializable { return Date.from(month.with(TemporalAdjusters.lastDayOfYear()).atTime(LocalTime.MAX) .atZone(ZoneId.systemDefault()).toInstant()); } - + public static Integer dayOfWeek(Date date) { Calendar c = Calendar.getInstance(); c.setTime(date); diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelGajiPegawai.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelGajiPegawai.java index 19b245c8..0e8b9d0b 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelGajiPegawai.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelGajiPegawai.java @@ -1,249 +1,32 @@ package com.jasamedika.medifirst2000.util; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; +@Getter +@NoArgsConstructor public class ExcelGajiPegawai { - + /** * Kode kolom diambil dari nama kolom file Excel */ - private final String[] kodeKolom = new String[] { "gjpokok", "tjistri", "tjanak", - "tjupns", "tjstruk", "tjfungs", "tjdaerah", "tjpencil", "tjlain", - "tjkompen", "pembul", "tjberas", "tjpph", "potpfkbul", "potpfk2", + private final String[] kodeKolom = new String[] { "gjpokok", "tjistri", "tjanak", "tjupns", "tjstruk", "tjfungs", + "tjdaerah", "tjpencil", "tjlain", "tjkompen", "pembul", "tjberas", "tjpph", "potpfkbul", "potpfk2", "potpfk10", "potpph", "potswrum", "potkelbtj", "potlain", "pottabrum", "bersih" }; - - private Map row = new HashMap(); - + + @Setter + private Map row = new HashMap<>(); + + @Setter private String bulan, tahun, nip, nmpeg; - - public BigDecimal gjpokok, tjistri, tjanak, - tjupns, tjstruk, tjfungs, tjdaerah, tjpencil, tjlain, - tjkompen, pembul, tjberas, tjpph, potpfkbul, potpfk2, - potpfk10, potpph, potswrum, potkelbtj, potlain, pottabrum, bersih; - public ExcelGajiPegawai() { - } - - public String[] getKodeKolom() { - return kodeKolom; - } - - public Map getRow() { - return row; - } - - public void setRow(Map row) { - this.row = row; - } - - public String getBulan() { - return bulan; - } - - public void setBulan(String bulan) { - this.bulan = bulan; - } - - public String getTahun() { - return tahun; - } - - public void setTahun(String tahun) { - this.tahun = tahun; - } - - public String getNip() { - return nip; - } - - public void setNip(String nip) { - this.nip = nip; - } - - public String getNmpeg() { - return nmpeg; - } - - public void setNmpeg(String nmpeg) { - this.nmpeg = nmpeg; - } - - public BigDecimal getGjpokok() { - return gjpokok; - } - - public void setGjpokok(BigDecimal gjpokok) { - this.gjpokok = gjpokok; - } - - public BigDecimal getTjistri() { - return tjistri; - } - - public void setTjistri(BigDecimal tjistri) { - this.tjistri = tjistri; - } - - public BigDecimal getTjanak() { - return tjanak; - } - - public void setTjanak(BigDecimal tjanak) { - this.tjanak = tjanak; - } - - public BigDecimal getTjupns() { - return tjupns; - } - - public void setTjupns(BigDecimal tjupns) { - this.tjupns = tjupns; - } - - public BigDecimal getTjstruk() { - return tjstruk; - } - - public void setTjstruk(BigDecimal tjstruk) { - this.tjstruk = tjstruk; - } - - public BigDecimal getTjfungs() { - return tjfungs; - } - - public void setTjfungs(BigDecimal tjfungs) { - this.tjfungs = tjfungs; - } - - public BigDecimal getTjdaerah() { - return tjdaerah; - } - - public void setTjdaerah(BigDecimal tjdaerah) { - this.tjdaerah = tjdaerah; - } - - public BigDecimal getTjpencil() { - return tjpencil; - } - - public void setTjpencil(BigDecimal tjpencil) { - this.tjpencil = tjpencil; - } - - public BigDecimal getTjlain() { - return tjlain; - } - - public void setTjlain(BigDecimal tjlain) { - this.tjlain = tjlain; - } - - public BigDecimal getTjkompen() { - return tjkompen; - } - - public void setTjkompen(BigDecimal tjkompen) { - this.tjkompen = tjkompen; - } - - public BigDecimal getPembul() { - return pembul; - } - - public void setPembul(BigDecimal pembul) { - this.pembul = pembul; - } - - public BigDecimal getTjberas() { - return tjberas; - } - - public void setTjberas(BigDecimal tjberas) { - this.tjberas = tjberas; - } - - public BigDecimal getTjpph() { - return tjpph; - } - - public void setTjpph(BigDecimal tjpph) { - this.tjpph = tjpph; - } - - public BigDecimal getPotpfkbul() { - return potpfkbul; - } - - public void setPotpfkbul(BigDecimal potpfkbul) { - this.potpfkbul = potpfkbul; - } - - public BigDecimal getPotpfk2() { - return potpfk2; - } - - public void setPotpfk2(BigDecimal potpfk2) { - this.potpfk2 = potpfk2; - } - - public BigDecimal getPotpfk10() { - return potpfk10; - } - - public void setPotpfk10(BigDecimal potpfk10) { - this.potpfk10 = potpfk10; - } - - public BigDecimal getPotpph() { - return potpph; - } - - public void setPotpph(BigDecimal potpph) { - this.potpph = potpph; - } - - public BigDecimal getPotswrum() { - return potswrum; - } - - public void setPotswrum(BigDecimal potswrum) { - this.potswrum = potswrum; - } - - public BigDecimal getPotkelbtj() { - return potkelbtj; - } - - public void setPotkelbtj(BigDecimal potkelbtj) { - this.potkelbtj = potkelbtj; - } - - public BigDecimal getPotlain() { - return potlain; - } - - public void setPotlain(BigDecimal potlain) { - this.potlain = potlain; - } - - public BigDecimal getPottabrum() { - return pottabrum; - } - - public void setPottabrum(BigDecimal pottabrum) { - this.pottabrum = pottabrum; - } - - public BigDecimal getBersih() { - return bersih; - } - - public void setBersih(BigDecimal bersih) { - this.bersih = bersih; - } + @Setter + private BigDecimal gjpokok, tjistri, tjanak, tjupns, tjstruk, tjfungs, tjdaerah, tjpencil, tjlain, tjkompen, pembul, + tjberas, tjpph, potpfkbul, potpfk2, potpfk10, potpph, potswrum, potkelbtj, potlain, pottabrum, bersih; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelUangMakan.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelUangMakan.java deleted file mode 100644 index c88b18fe..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExcelUangMakan.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jasamedika.medifirst2000.util; - -public class ExcelUangMakan { - - private final String[] kodeKolom = new String[] { - "nomakan", "tgl", "bln", "thn", "kdsatker", "kdanak", "kdsubanak", - "nip", "kdgol", "gol", "nmpeg", "jmlhari", "tarif", "kotor", "pph", "bersih", "rekening" - }; - -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExtendedSpringBeanUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExtendedSpringBeanUtil.java index c4724dbc..5f81538a 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExtendedSpringBeanUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ExtendedSpringBeanUtil.java @@ -1,5 +1,9 @@ package com.jasamedika.medifirst2000.util; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.FatalBeanException; + import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -7,174 +11,102 @@ import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.List; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.BeansException; -import org.springframework.beans.FatalBeanException; - -import com.jasamedika.medifirst2000.enums.BaseModelEnum; - /** - * Util class for for copying values of object to another object + * Util class for copying values of object to another object * * @author Roberto */ public class ExtendedSpringBeanUtil extends BeanUtils { - /** - * copy properties from other object with same attributes name - * - * @param source - * @param target - * @param copiedProperties - * @throws BeansException - */ - public static void copySpecificProperties(Object source, Object target, - String[] copiedProperties) throws BeansException { + // copy properties from other object with same attributes name + public static void copySpecificProperties(Object source, Object target, String[] copiedProperties) + throws BeansException { Class actualEditable = target.getClass(); - if (copiedProperties == null) { copyProperties(source, target); return; } - PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable); - List copiedList = (copiedProperties != null) ? Arrays - .asList(copiedProperties) : null; - + List copiedList = Arrays.asList(copiedProperties); for (PropertyDescriptor targetPd : targetPds) { - if (targetPd.getWriteMethod() != null - && copiedList.contains(targetPd.getName()) - && copiedProperties != null - - ) { - PropertyDescriptor sourcePd = getPropertyDescriptor( - source.getClass(), targetPd.getName()); + if (targetPd.getWriteMethod() != null && copiedList.contains(targetPd.getName())) { + PropertyDescriptor sourcePd = getPropertyDescriptor(source.getClass(), targetPd.getName()); if (sourcePd != null && sourcePd.getReadMethod() != null) { try { Method readMethod = sourcePd.getReadMethod(); - if (!Modifier.isPublic(readMethod.getDeclaringClass() - .getModifiers())) { + if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) { readMethod.setAccessible(true); } Object value = readMethod.invoke(source); Method writeMethod = targetPd.getWriteMethod(); - if (!Modifier.isPublic(writeMethod.getDeclaringClass() - .getModifiers())) { + if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) { writeMethod.setAccessible(true); } writeMethod.invoke(target, value); } catch (Throwable ex) { - throw new FatalBeanException( - "Could not copy properties from source to target", - ex); + throw new FatalBeanException("Could not copy properties from source to target", ex); } } } } } - /** - * copy properties from object to other object with same or different - * attributes name count attributes must be same - * - * @param source - * @param target - * @param sourceCopiedProperties - * @param targetCopiedProperties - * @throws BeansException - */ + // copy properties from object to other object with same or different + // attributes name count attributes must be same @SuppressWarnings("rawtypes") - public static void copySpecificProperties(Object source, Object target, - String[] sourceCopiedProperties, String[] targetCopiedProperties) - throws BeansException { - + public static void copySpecificProperties(Object source, Object target, String[] sourceCopiedProperties, + String[] targetCopiedProperties) throws BeansException { if (sourceCopiedProperties == null) { copyProperties(source, target); return; } - if (sourceCopiedProperties.length != targetCopiedProperties.length) { - throw new FatalBeanException( - "Count source copy properties must be equal with target copy properties"); + throw new FatalBeanException("Count source copy properties must be equal with target copy properties"); } - - List sourceCopiedList = (sourceCopiedProperties != null) ? Arrays - .asList(sourceCopiedProperties) : null; - List targetCopiedList = (targetCopiedProperties != null) ? Arrays - .asList(targetCopiedProperties) : null; - + List targetCopiedList = Arrays.asList(targetCopiedProperties); int n = 0; - - for (String sourceCopied : sourceCopiedList) { - PropertyDescriptor sourcePd = getPropertyDescriptor( - source.getClass(), sourceCopied); - PropertyDescriptor targetPd = getPropertyDescriptor( - target.getClass(), targetCopiedList.get(n)); - if ((sourcePd != null && targetPd != null)) { - - if (sourcePd != null && sourcePd.getReadMethod() != null - && targetPd != null && targetPd.getReadMethod() != null) { - if (sourcePd.getPropertyType().equals( - targetPd.getPropertyType())) { - try { - Method readMethod = sourcePd.getReadMethod(); - if (!Modifier.isPublic(readMethod - .getDeclaringClass().getModifiers())) { - readMethod.setAccessible(true); - } - Object value = readMethod.invoke(source); - copyValue(target, targetPd, value); - - } catch (Throwable ex) { - throw new FatalBeanException( - "Could not copy properties from source to target", - ex); - } - } else { - try { - - Object value = null; - - Method readMethod = sourcePd.getReadMethod(); - if (!Modifier.isPublic(readMethod - .getDeclaringClass().getModifiers())) { - readMethod.setAccessible(true); - } - - Object object = readMethod.invoke(source); - - if (object instanceof BaseModelEnum) { - value = ((BaseModelEnum) object) - .getInternalValue(); - } - copyValue(target, targetPd, value); - - } catch (Throwable ex) { - throw new FatalBeanException( - "Could not copy properties from source to target", - ex); + for (String sourceCopied : sourceCopiedProperties) { + PropertyDescriptor sourcePd = getPropertyDescriptor(source.getClass(), sourceCopied); + PropertyDescriptor targetPd = getPropertyDescriptor(target.getClass(), targetCopiedList.get(n)); + if (sourcePd != null && targetPd != null && sourcePd.getReadMethod() != null + && targetPd.getReadMethod() != null) { + if (sourcePd.getPropertyType().equals(targetPd.getPropertyType())) { + try { + Method readMethod = sourcePd.getReadMethod(); + if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) + readMethod.setAccessible(true); + Object value = readMethod.invoke(source); + copyValue(target, targetPd, value); + } catch (Throwable ex) { + throw new FatalBeanException("Could not copy properties from source to target", ex); + } + } else { + try { + Object value = null; + Method readMethod = sourcePd.getReadMethod(); + if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) + readMethod.setAccessible(true); + Object object = readMethod.invoke(source); + if (object instanceof BaseModelEnum) { + value = ((BaseModelEnum) object).getInternalValue(); } + copyValue(target, targetPd, value); + } catch (Throwable ex) { + throw new FatalBeanException("Could not copy properties from source to target", ex); } } } - n++; - } } - private static void copyValue(Object target, PropertyDescriptor targetPd, - Object value) throws IllegalAccessException, - InvocationTargetException { + private static void copyValue(Object target, PropertyDescriptor targetPd, Object value) + throws IllegalAccessException, InvocationTargetException { // update target value only if source value is not null if (null != value) { - Method writeMethod = targetPd.getWriteMethod(); - - if (!Modifier.isPublic(writeMethod.getDeclaringClass() - .getModifiers())) { + if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) writeMethod.setAccessible(true); - } writeMethod.invoke(target, value); } } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/HelloWorldUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/HelloWorldUtil.java deleted file mode 100644 index 95fe0f67..00000000 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/HelloWorldUtil.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jasamedika.medifirst2000.util; - -/** - * Simple Util Class, for example - * - * @author Roberto - */ -public class HelloWorldUtil { - public static String sayName(String name) { - return "hi " + name; - } -} diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ImageUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ImageUtil.java index 4ab2ee6a..c109329c 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ImageUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/ImageUtil.java @@ -1,26 +1,17 @@ package com.jasamedika.medifirst2000.util; -import java.awt.AlphaComposite; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.imageio.ImageIO; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; + /** * Utilities for image manipulation. * @@ -30,23 +21,18 @@ public final class ImageUtil { /** The Constant LOG.logger */ private static final Log LOG = LogFactory.getLog(ImageUtil.class); + /** The Constant DEFAULT_IMAGE_FORMAT. The default image format is PNG */ private static final String DEFAULT_IMAGE_FORMAT = "PNG"; public static String encodeFileToBase64Binary(File file) { - String result = ""; try { - FileInputStream fileInputStreamReader = new FileInputStream(file); byte[] bytes = new byte[(int) file.length()]; - fileInputStreamReader.read(bytes); - result = new String(Base64.encodeBase64(bytes), "UTF-8"); - - fileInputStreamReader.close(); - - return result; + return new String(Base64.encodeBase64(bytes), StandardCharsets.UTF_8); } catch (Exception e) { - return result; + LOG.error(e.getMessage()); } + return ""; } /** @@ -59,16 +45,15 @@ public final class ImageUtil { * @param scaledHeight * New height after resizing * @param preserveAlpha - * Set the value to false to keep the transparency + * Set the value false to keep the transparency * @return Resized image * @throws IOException * Signals that an I/O exception has occurred. */ public static byte[] resizeImage(byte[] imageData, int scaledWidth, int scaledHeight, boolean preserveAlpha) throws IOException { - if (ArrayUtils.isEmpty(imageData)) { + if (ArrayUtils.isEmpty(imageData)) return new byte[] {}; - } BufferedImage originalImage = createImage(imageData); BufferedImage resizedImage = resizeImage(originalImage, scaledWidth, scaledHeight, preserveAlpha); return getImageBytes(resizedImage); @@ -84,16 +69,15 @@ public final class ImageUtil { * @param scaledHeight * New height after resizing * @param preserveAlpha - * Set the value to false to keep the transparency + * Set the value false to keep the transparency * @return Resized image */ public static BufferedImage resizeImage(Image image, int scaledWidth, int scaledHeight, boolean preserveAlpha) { int imageType = preserveAlpha ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB; BufferedImage scaledBI = new BufferedImage(scaledWidth, scaledHeight, imageType); Graphics2D g = scaledBI.createGraphics(); - if (preserveAlpha) { + if (preserveAlpha) g.setComposite(AlphaComposite.Src); - } // we prefer quality than speed g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); @@ -133,22 +117,19 @@ public final class ImageUtil { public static String storeImage(String filename, String extension, byte[] imageData) throws IOException { String ext = extension; // extension must have dot (.) character in front of it - if (extension.charAt(0) != '.') { + if (extension.charAt(0) != '.') ext = "." + ext; - } // Open output file File outputFile = File.createTempFile(filename, ext); - OutputStream out = new FileOutputStream(outputFile); - try { + try (OutputStream out = Files.newOutputStream(outputFile.toPath())) { out.write(imageData); out.flush(); - } finally { - out.close(); } // format the url of barcode file String url = outputFile.toURI().toString(); - // url = url.replace("file:", OpenOfficeUtil.FILE_SCHEME); + LOG.info("Storing image in: " + url); + return url; } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/IndonesianNumberToWords.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/IndonesianNumberToWords.java index 61c7f962..0ba31ae4 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/IndonesianNumberToWords.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/IndonesianNumberToWords.java @@ -1,5 +1,7 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; + import java.io.Serializable; import java.text.DecimalFormat; @@ -8,6 +10,7 @@ import java.text.DecimalFormat; * * @author Roberto */ +@NoArgsConstructor public final class IndonesianNumberToWords implements Serializable { /** The Constant serialVersionUID. */ @@ -21,21 +24,14 @@ public final class IndonesianNumberToWords implements Serializable { private static final int TWENTY = 20; private static final int HUNDRED = 100; - private IndonesianNumberToWords() { - // To prevent instantiation of this class - } - /** The Constant TENS_NAMES. */ - private static final String[] TENS_NAMES = { "", " sepuluh", " dua puluh", - " tiga puluh", " empat puluh", " lima puluh", " enam puluh", - " tujuh puluh", " delapan puluh", " sembilan puluh" }; + private static final String[] TENS_NAMES = { "", " sepuluh", " dua puluh", " tiga puluh", " empat puluh", + " lima puluh", " enam puluh", " tujuh puluh", " delapan puluh", " sembilan puluh" }; /** The Constant NUMBER_NAMES. */ - private static final String[] NUMBER_NAMES = { "", " satu", " dua", - " tiga", " empat", " lima", " enam", " tujuh", " delapan", - " sembilan", " sepuluh", " sebelas", " dua belas", " tiga belas", - " empat belas", " lima belas", " enam belas", " tujuh belas", - " delapan belas", " sembilan belas" }; + private static final String[] NUMBER_NAMES = { "", " satu", " dua", " tiga", " empat", " lima", " enam", " tujuh", + " delapan", " sembilan", " sepuluh", " sebelas", " dua belas", " tiga belas", " empat belas", " lima belas", + " enam belas", " tujuh belas", " delapan belas", " sembilan belas" }; /** * Convert less than one thousand. @@ -56,14 +52,11 @@ public final class IndonesianNumberToWords implements Serializable { soFar = TENS_NAMES[convertedNum % TEN] + soFar; convertedNum /= TEN; } - if (convertedNum == 0) { + if (convertedNum == 0) return soFar; - } - if (convertedNum == 1) { + if (convertedNum == 1) return "seratus" + soFar; - } else { - return NUMBER_NAMES[convertedNum] + " ratus" + soFar; - } + return NUMBER_NAMES[convertedNum] + " ratus" + soFar; } /** @@ -76,10 +69,9 @@ public final class IndonesianNumberToWords implements Serializable { */ public static String convert(long number) { // 0 to 999 999 999 999 - if (number == 0) { + if (number == 0) return "nol"; - } - String snumber = Long.toString(number); + String snumber; // pad with "0" String mask = "000000000000"; DecimalFormat df = new DecimalFormat(mask); @@ -93,26 +85,16 @@ public final class IndonesianNumberToWords implements Serializable { // nnnnnnnnnXXX int thousands = Integer.parseInt(snumber.substring(NINE, TWELVE)); String tradBillions; - switch (billions) { - case 0: + if (billions == 0) { tradBillions = ""; - break; - case 1: - tradBillions = convertLessThanOneThousand(billions) + " milyar "; - break; - default: + } else { tradBillions = convertLessThanOneThousand(billions) + " milyar "; } String result = tradBillions; String tradMillions; - switch (millions) { - case 0: + if (millions == 0) { tradMillions = ""; - break; - case 1: - tradMillions = convertLessThanOneThousand(millions) + " juta "; - break; - default: + } else { tradMillions = convertLessThanOneThousand(millions) + " juta "; } result = result + tradMillions; @@ -125,8 +107,7 @@ public final class IndonesianNumberToWords implements Serializable { tradHundredThousands = "seribu "; break; default: - tradHundredThousands = convertLessThanOneThousand(hundredThousands) - + " ribu "; + tradHundredThousands = convertLessThanOneThousand(hundredThousands) + " ribu "; } result = result + tradHundredThousands; String tradThousand; diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/JsonUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/JsonUtil.java index d2317097..3954dfd5 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/JsonUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/JsonUtil.java @@ -1,532 +1,326 @@ package com.jasamedika.medifirst2000.util; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; - -import org.hibernate.Hibernate; -import org.hibernate.proxy.HibernateProxy; -import org.springframework.transaction.annotation.Transactional; - import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.jasamedika.medifirst2000.base.BaseModel; +import lombok.extern.slf4j.Slf4j; +import org.hibernate.Hibernate; +import org.hibernate.proxy.HibernateProxy; +import org.springframework.transaction.annotation.Transactional; +import javax.persistence.Column; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import java.lang.reflect.Field; +import java.util.*; +@Slf4j public class JsonUtil { public static T initializeAndUnproxy(T entity) { - if (entity == null) { + if (entity == null) throw new NullPointerException("Entity passed for initialization is null"); - } - Hibernate.initialize(entity); - if (entity instanceof HibernateProxy) { + if (entity instanceof HibernateProxy) entity = (T) ((HibernateProxy) entity).getHibernateLazyInitializer().getImplementation(); - } return entity; } - public static List> ToMaps(Set model,Integer depth) { - List> maps = new ArrayList>(); - for (Iterator iterator = model.iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); + + public static List> ToMaps(Set model, Integer depth) { + List> maps = new ArrayList<>(); + for (T map : model) { Map convert = null; try { - convert = ToMap(map,depth); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + convert = ToMap(map, depth); + } catch (IllegalArgumentException | IllegalAccessException e) { + log.error(e.getMessage()); } maps.add(convert); } return maps; } + public static List> ToMaps(Set model) { - List> maps = new ArrayList>(); - for (Iterator iterator = model.iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); + List> maps = new ArrayList<>(); + for (T map : model) { Map convert = null; try { convert = ToMap(map); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + } catch (IllegalArgumentException | IllegalAccessException e) { + log.error(e.getMessage()); } maps.add(convert); } return maps; } - @Transactional - public static List> ToMaps(List model,Integer depth) - throws IllegalArgumentException, IllegalAccessException { - List> maps = new ArrayList>(); - for (Iterator iterator = model.iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); - Map convert = (Map) ToMapObject(map,depth); + @Transactional + public static List> ToMaps(List model, Integer depth) + throws IllegalArgumentException, IllegalAccessException { + List> maps = new ArrayList<>(); + for (T map : model) { + Map convert = (Map) ToMapObject(map, depth); maps.add(convert); } return maps; } + @Transactional public static List> ToMaps(List model) throws IllegalArgumentException, IllegalAccessException { - - List> maps = new ArrayList>(); - for (Iterator iterator = model.iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); + List> maps = new ArrayList<>(); + for (T map : model) { Map convert = (Map) ToMapObject(map); maps.add(convert); } return maps; } + public static Map ToMap(T model) throws IllegalArgumentException, IllegalAccessException { - return ToMap(model,0); + return ToMap(model, 0); } - public static Map ToMap(T model,Integer depth) throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); - List fieldsToInclude = new ArrayList(); + public static Map ToMap(T model, Integer depth) + throws IllegalArgumentException, IllegalAccessException { + Map maps = new HashMap<>(); if (model instanceof BaseModel) - - for (Field field : ((BaseModel) model).GetFields(model.getClass())) { - String str = field.getName(); - if (str.equals("ruanganTujuan")) { - System.out.println(); - } + for (Field field : BaseModel.GetFields(model.getClass())) { String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - } - if (valid == false) + boolean valid = isValidDetail(field); + if (!valid) maps.put(field.getName(), field.get(model)); - } - if(depth>1) - for (Field field : ((BaseModel) model).GetFields(model.getClass())) { - String str = field.getName(); - String name = field.getName(); - field.setAccessible(true); - if (str.equals("departemen")) { - System.out.println(); - } - if (name.equals("serialVersionUID")) - continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; + if (depth > 1) { + for (Field field : BaseModel.GetFields(model.getClass())) { + String str = field.getName(); + String name = field.getName(); + field.setAccessible(true); + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; } - } - if (valid == true) { - Object property = field.get(model); - - if (property == null) - maps.put(str, null); - else { - if (property instanceof Set) { - List> detailMaps = new ArrayList>(); - - for (Iterator iterator = ((Set)property).iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); - Map convert = (Map) ToMapObject(map); - detailMaps.add(convert); - } - - maps.put(str, detailMaps); - }else - if (property instanceof BaseModel) { - Map mapItems = new HashMap(); - for (Field fieldItem : ((BaseModel) property).GetFields(property.getClass())) { - String strItem = fieldItem.getName(); - String nameItem = fieldItem.getName(); - fieldItem.setAccessible(true); - if (nameItem.equals("serialVersionUID")) - continue; - if (nameItem.equals("_methods_")) - continue; - if (nameItem.equals("handler")) - continue; - if (nameItem.equals("_filter_signature")) - continue; - Boolean validItem = false; - for (java.lang.annotation.Annotation annotationItem : fieldItem.getDeclaredAnnotations()) { - if (annotationItem instanceof JoinColumn) { - validItem = true; - } else if (annotationItem instanceof Column) { - Column columnItem = (Column) annotationItem; - if (columnItem.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - validItem = true; - } else if (annotationItem instanceof OneToMany) { - - validItem = true; + boolean valid = isValidDetail(field); + if (valid) { + Object property = field.get(model); + if (property == null) + maps.put(str, null); + else { + if (property instanceof Set) { + List> detailMaps = new ArrayList<>(); + for (Object o : (Set) property) { + T map = (T) o; + Map convert = (Map) ToMapObject(map); + detailMaps.add(convert); + } + maps.put(str, detailMaps); + } else if (property instanceof BaseModel) { + Map mapItems = new HashMap<>(); + for (Field fieldItem : BaseModel.GetFields(property.getClass())) { + String nameItem = fieldItem.getName(); + fieldItem.setAccessible(true); + switch (nameItem) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; + } + boolean validItem = isValidDetail(fieldItem); + if (!validItem) { + mapItems.put(fieldItem.getName(), fieldItem.get(property)); } } - if (validItem == false) { - mapItems.put(fieldItem.getName(), fieldItem.get(property)); - } - } - for (Field fieldDetail : ((BaseModel) property).GetFields(property.getClass())) { - String strDetail = fieldDetail.getName(); - String nameDetail = fieldDetail.getName(); - fieldDetail.setAccessible(true); - if (nameDetail.equals("serialVersionUID")) - continue; - if (nameDetail.equals("_methods_")) - continue; - if (nameDetail.equals("handler")) - continue; - if (nameDetail.equals("_filter_signature")) - continue; - Boolean validDetail = false; - for (java.lang.annotation.Annotation annotationDetail : fieldDetail - .getDeclaredAnnotations()) { - if (annotationDetail instanceof JoinColumn) { - validDetail = true; - } else if (annotationDetail instanceof Column) { - Column column = (Column) annotationDetail; - if (column.name().endsWith("Fk")) - if (fieldDetail.getName().endsWith("Id") == false) - validDetail = true; - } else if (annotationDetail instanceof OneToMany) { - - validDetail = true; + for (Field fieldDetail : BaseModel.GetFields(property.getClass())) { + String strDetail = fieldDetail.getName(); + String nameDetail = fieldDetail.getName(); + fieldDetail.setAccessible(true); + switch (nameDetail) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; } - } - if (validDetail == true) { - Object propertyDetail = fieldDetail.get(property); - - if (propertyDetail instanceof BaseModel) { - Map mapDetailItems = new HashMap(); - for (Field fieldDetailItem : ((BaseModel) propertyDetail) - .GetFields(propertyDetail.getClass())) { - String strDetailItem = fieldDetailItem.getName(); - String nameDetailItem = fieldDetailItem.getName(); - fieldDetailItem.setAccessible(true); - if (nameDetailItem.equals("serialVersionUID")) - continue; - if (nameDetailItem.equals("_methods_")) - continue; - if (nameDetailItem.equals("handler")) - continue; - if (nameDetailItem.equals("_filter_signature")) - continue; - Boolean validDetailItem = false; - for (java.lang.annotation.Annotation annotationDetailItem : fieldDetailItem - .getDeclaredAnnotations()) { - if (annotationDetailItem instanceof JoinColumn) { - validDetailItem = true; - } else if (annotationDetailItem instanceof Column) { - Column columnItem = (Column) annotationDetailItem; - if (columnItem.name().endsWith("Fk")) - if (fieldDetailItem.getName().endsWith("Id") == false) - validDetailItem = true; - } else if (annotationDetailItem instanceof OneToMany) { - - validDetailItem = true; + boolean validDetail = isValidDetail(fieldDetail); + if (validDetail) { + Object propertyDetail = fieldDetail.get(property); + if (propertyDetail instanceof BaseModel) { + Map mapDetailItems = new HashMap<>(); + for (Field fieldDetailItem : BaseModel.GetFields(propertyDetail.getClass())) { + String nameDetailItem = fieldDetailItem.getName(); + fieldDetailItem.setAccessible(true); + switch (nameDetailItem) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; } + boolean validDetailItem = isValidDetail(fieldDetailItem); + if (!validDetailItem) + mapDetailItems.put(fieldDetailItem.getName(), + fieldDetailItem.get(propertyDetail)); } - if (validDetailItem == false) { - mapDetailItems.put(fieldDetailItem.getName(), - fieldDetailItem.get(propertyDetail)); - } + mapItems.put(strDetail, mapDetailItems); } - mapItems.put(strDetail, mapDetailItems); } - } + maps.put(str, mapItems); } - maps.put(str, mapItems); } - } - } } - return maps; } + public static Object ToMapObject(T model) throws IllegalArgumentException, IllegalAccessException { - return ToMapObject(model,0); + return ToMapObject(model, 0); } - public static Object ToMapObject(T model,Integer depth) throws IllegalArgumentException, IllegalAccessException { - Map maps = new HashMap(); - List fieldsToInclude = new ArrayList(); + + public static Object ToMapObject(T model, Integer depth) + throws IllegalArgumentException, IllegalAccessException { + Map maps = new HashMap<>(); if ((model instanceof Map)) { - Map result = new HashMap(); + Map result = new HashMap<>(); Map obj = (Map) model; for (String str : obj.keySet()) { Object array_element = obj.get(str); if (array_element instanceof BaseModel) { - - result.put(str, ((BaseModel)array_element).ToMap()); + result.put(str, ((BaseModel) array_element).ToMap()); + } else { + result.put(str, array_element); } - else - result.put(str,array_element); } - - return (Map) result; + return result; } - - for (Field field : ((BaseModel) model).GetFields(model.getClass())) { - String str = field.getName(); - + for (Field field : BaseModel.GetFields(model.getClass())) { String name = field.getName(); field.setAccessible(true); - if (name.equals("serialVersionUID")) + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; - } - } - if (valid == false) + boolean valid = isValidDetail(field); + if (!valid) maps.put(field.getName(), field.get(model)); } - if(depth ==0) - for (Field field : ((BaseModel) model).GetFields(model.getClass())) { - String str = field.getName(); - String name = field.getName(); - field.setAccessible(true); - if (str.equals("departemen")) { - System.out.println(); - } - if (name.equals("serialVersionUID")) - continue; - if (name.equals("_methods_")) - continue; - if (name.equals("handler")) - continue; - if (name.equals("_filter_signature")) - continue; - Boolean valid = false; - for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { - if (annotation instanceof JoinColumn) { - valid = true; - } else if (annotation instanceof Column) { - Column column = (Column) annotation; - if (column.name().endsWith("Fk")) - if (field.getName().endsWith("Id") == false) - valid = true; - } else if (annotation instanceof OneToMany) { - - valid = true; + if (depth == 0) { + for (Field field : BaseModel.GetFields(model.getClass())) { + String str = field.getName(); + String name = field.getName(); + field.setAccessible(true); + switch (name) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; } - } - if (valid == true) { - Object property = field.get(model); - if (property instanceof HibernateProxy) { - property = initializeAndUnproxy(property); - } - if (property == null) - maps.put(str, null); - else { - if (property instanceof Set) { - List> mapsChild = new ArrayList>(); - for (Iterator iterator = ((Set) property).iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); - Map convert = (Map) ToMapObject(map); - mapsChild.add(convert); + boolean valid = isValidDetail(field); + if (valid) { + Object property = field.get(model); + if (property instanceof HibernateProxy) + property = initializeAndUnproxy(property); + if (property == null) { + maps.put(str, null); + } else { + if (property instanceof Set) { + List> mapsChild = new ArrayList<>(); + for (Object o : (Set) property) { + T map = (T) o; + Map convert = (Map) ToMapObject(map); + mapsChild.add(convert); + } + maps.put(str, mapsChild); + } + if (property instanceof BaseModel) { + Map mapItems = new HashMap<>(); + for (Field fieldItem : BaseModel.GetFields(property.getClass())) { + String nameItem = fieldItem.getName(); + fieldItem.setAccessible(true); + switch (nameItem) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; + } + boolean validItem = isValidDetail(fieldItem); + if (!validItem) + mapItems.put(fieldItem.getName(), fieldItem.get(property)); + } + for (Field fieldDetail : BaseModel.GetFields(property.getClass())) { + String strDetail = fieldDetail.getName(); + String nameDetail = fieldDetail.getName(); + fieldDetail.setAccessible(true); + switch (nameDetail) { + case "serialVersionUID": + case "_methods_": + case "handler": + case "_filter_signature": + continue; + } + boolean validDetail = isValidDetail(fieldDetail); + if (validDetail) { + Object propertyDetail = fieldDetail.get(property); + if (propertyDetail instanceof HibernateProxy) + propertyDetail = initializeAndUnproxy(propertyDetail); + if (propertyDetail instanceof BaseModel) { + Map mapDetailItems = ((BaseModel) propertyDetail).ToMap(); + mapItems.put(strDetail, mapDetailItems); + } + } + } + maps.put(str, mapItems); } - maps.put(str, mapsChild); } - if (property instanceof BaseModel) { - Map mapItems = new HashMap(); - for (Field fieldItem : ((BaseModel) property).GetFields(property.getClass())) { - String strItem = fieldItem.getName(); - String nameItem = fieldItem.getName(); - fieldItem.setAccessible(true); - if (nameItem.equals("serialVersionUID")) - continue; - if (nameItem.equals("_methods_")) - continue; - if (nameItem.equals("handler")) - continue; - if (nameItem.equals("_filter_signature")) - continue; - Boolean validItem = false; - for (java.lang.annotation.Annotation annotationItem : fieldItem.getDeclaredAnnotations()) { - if (annotationItem instanceof JoinColumn) { - validItem = true; - } else if (annotationItem instanceof Column) { - Column columnItem = (Column) annotationItem; - if (columnItem.name().endsWith("Fk")) - if (fieldItem.getName().endsWith("Id") == false) - validItem = true; - } else if (annotationItem instanceof OneToMany) { - - validItem = true; - } - } - if (validItem == false) { - mapItems.put(fieldItem.getName(), fieldItem.get(property)); - } - } - for (Field fieldDetail : ((BaseModel) property).GetFields(property.getClass())) { - String strDetail = fieldDetail.getName(); - String nameDetail = fieldDetail.getName(); - fieldDetail.setAccessible(true); - if (nameDetail.equals("serialVersionUID")) - continue; - if (nameDetail.equals("_methods_")) - continue; - if (nameDetail.equals("handler")) - continue; - if (nameDetail.equals("_filter_signature")) - continue; - Boolean validDetail = false; - for (java.lang.annotation.Annotation annotationDetail : fieldDetail - .getDeclaredAnnotations()) { - if (annotationDetail instanceof JoinColumn) { - validDetail = true; - } else if (annotationDetail instanceof Column) { - Column column = (Column) annotationDetail; - if (column.name().endsWith("Fk")) - if (fieldDetail.getName().endsWith("Id") == false) - validDetail = true; - } else if (annotationDetail instanceof OneToMany) { - - validDetail = true; - } - } - if (validDetail == true) { - Object propertyDetail = fieldDetail.get(property); - if (propertyDetail instanceof HibernateProxy) { - propertyDetail = initializeAndUnproxy(propertyDetail); - } - if (propertyDetail instanceof BaseModel) { - Map mapDetailItems = new HashMap(); - mapDetailItems = ((BaseModel) propertyDetail).ToMap(); -// for (Field fieldDetailItem : ((BaseModel) propertyDetail) -// .GetFields(propertyDetail.getClass())) { -// String strDetailItem = fieldDetailItem.getName(); -// String nameDetailItem = fieldDetailItem.getName(); -// fieldDetailItem.setAccessible(true); -// if (nameDetailItem.equals("serialVersionUID")) -// continue; -// if (nameDetailItem.equals("_methods_")) -// continue; -// if (nameDetailItem.equals("handler")) -// continue; -// if (nameDetailItem.equals("_filter_signature")) -// continue; -// Boolean validDetailItem = false; -// for (java.lang.annotation.Annotation annotationDetailItem : fieldDetailItem -// .getDeclaredAnnotations()) { -// if (annotationDetailItem instanceof JoinColumn) { -// validDetailItem = true; -// } else if (annotationDetailItem instanceof Column) { -// Column columnItem = (Column) annotationDetailItem; -// if (columnItem.name().endsWith("Fk")) -// if (fieldDetailItem.getName().endsWith("Id") == false) -// validDetailItem = true; -// } else if (annotationDetailItem instanceof OneToMany) { -// -// validDetailItem = true; -// } -// } -// if (validDetailItem == false) { -// mapDetailItems.put(fieldDetailItem.getName(), -// fieldDetailItem.get(propertyDetail)); -// } -// } - mapItems.put(strDetail, mapDetailItems); - } - - } - } - maps.put(str, mapItems); - } - } - } } - return maps; } + private static boolean isValidDetail(Field fieldDetail) { + boolean validDetail = false; + for (java.lang.annotation.Annotation annotationDetail : fieldDetail.getDeclaredAnnotations()) { + if (annotationDetail instanceof JoinColumn) { + validDetail = true; + } else if (annotationDetail instanceof Column) { + Column column = (Column) annotationDetail; + if (column.name().endsWith("Fk")) + if (!fieldDetail.getName().endsWith("Id")) + validDetail = true; + } else if (annotationDetail instanceof OneToMany) { + validDetail = true; + } + } + return validDetail; + } + public static Map Convert(String jsonText) { Gson gson = new Gson(); - String json = ""; - - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("name", "mkyong"); map.put("age", 29); - // convert map to JSON string map = gson.fromJson(jsonText, map.getClass()); - - System.out.println(json); - - // json = - // mapper.writerWithDefaultPrettyPrinter().writeValueAsString(map); - // pretty print - System.out.println(json); return map; } @@ -535,45 +329,41 @@ public class JsonUtil { return (T) gson.fromJson(string, vo.getClass()); } + public static List> ToMaps(Iterable findAll) { - List> maps = new ArrayList>(); - for (Iterator iterator = findAll.iterator(); iterator.hasNext();) { - T map = (T) iterator.next(); - Map convert = new HashMap(); + List> maps = new ArrayList<>(); + for (T map : findAll) { + Map convert = new HashMap<>(); try { convert = (Map) ToMapObject(map); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + } catch (IllegalArgumentException | IllegalAccessException e) { + log.error(e.getMessage()); } maps.add(convert); } return maps; } - + public static Map JsonToMap(String value) { - Map result = new HashMap(); - try { - Gson gson = new Gson(); - result = (Map)gson.fromJson(value, Map.class); - } - catch (JsonSyntaxException ex) { - ex.printStackTrace(); - } - return result; - } - + Map result = new HashMap<>(); + try { + Gson gson = new Gson(); + result = (Map) gson.fromJson(value, Map.class); + } catch (JsonSyntaxException e) { + log.error(e.getMessage()); + } + return result; + } + public static String MapToJson(Map value) { - String result = null; - try { - Gson gson = new Gson(); - result = gson.toJson(value); - } - catch (JsonSyntaxException ex) { - ex.printStackTrace(); - } - return result; - } + String result = null; + try { + Gson gson = new Gson(); + result = gson.toJson(value); + } catch (JsonSyntaxException e) { + log.error(e.getMessage()); + } + return result; + } } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/MathUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/MathUtil.java index 3a418b80..392723d2 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/MathUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/MathUtil.java @@ -1,5 +1,7 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; + import java.math.BigDecimal; import java.math.RoundingMode; @@ -7,20 +9,14 @@ import java.math.RoundingMode; * @author salmanoe * @since Dec 29, 2021 */ +@NoArgsConstructor public class MathUtil { - public MathUtil() { - super(); - } - public static double round(double value, int places) { if (places < 0) throw new IllegalArgumentException(); - BigDecimal bd = BigDecimal.valueOf(value); bd = bd.setScale(places, RoundingMode.HALF_UP); - return bd.doubleValue(); } - } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/PasswordUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/PasswordUtil.java index 7da71643..f00a7c11 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/PasswordUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/PasswordUtil.java @@ -1,30 +1,29 @@ package com.jasamedika.medifirst2000.util; -import java.io.IOException; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.Arrays; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.io.IOException; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Arrays; + /** * This is a utility that related with password. most of the code is inspired - * from http://www.owasp.org/index.php/Hashing_Java - * + * from Hashing Java + * * @author Roberto - * + * */ public class PasswordUtil implements Serializable { - - public static void main(String ... args) throws Exception { - PasswordUtil util = new PasswordUtil(); - System.out.println(util.encryptPassword("admin")); - } + + /** The Constant LOG. */ + private static final Log LOG = LogFactory.getLog(PasswordUtil.class); /** The Constant serialVersionUID. */ private static final long serialVersionUID = 5821601416373245537L; @@ -38,9 +37,6 @@ public class PasswordUtil implements Serializable { /** The base64. */ private final Base64 base64; - /** The Constant LOG. */ - private static final Log LOG = LogFactory.getLog(PasswordUtil.class); - /** * constructor. */ @@ -59,14 +55,13 @@ public class PasswordUtil implements Serializable { * @throws UnsupportedEncodingException * the unsupported encoding exception */ - public String encryptPassword(String password) - throws NoSuchAlgorithmException, UnsupportedEncodingException { + public String encryptPassword(String password) throws NoSuchAlgorithmException, UnsupportedEncodingException { SecureRandom random = SecureRandom.getInstance("SHA1PRNG"); // Salt generation 64 bits long byte[] bSalt = new byte[BYTES_ON_SIXTY_FOUR_BITS]; random.nextBytes(bSalt); // Digest computation - byte[] bDigest = getHash(ITERATION_NUMBER, password, bSalt); + byte[] bDigest = getHash(password, bSalt); String sDigest = byteToBase64(bDigest); String sSalt = byteToBase64(bSalt); return sDigest + "$" + sSalt; @@ -83,24 +78,20 @@ public class PasswordUtil implements Serializable { * @throws IOException * Signals that an I/O exception has occurred. */ - public boolean isPasswordEqual(String password, String hash) - throws IOException { - if (password == null || hash == null) { + public boolean isPasswordEqual(String password, String hash) throws IOException { + if (password == null || hash == null) throw new IllegalArgumentException("Please fill the parameter"); - } String[] currentHashSalt = hash.split("\\$"); - if (currentHashSalt.length <= 1) { + if (currentHashSalt.length <= 1) return false; - } - if (currentHashSalt[0].isEmpty() || currentHashSalt[1].isEmpty()) { + if (currentHashSalt[0].isEmpty() || currentHashSalt[1].isEmpty()) return false; - } byte[] bDigest = this.base64ToByte(currentHashSalt[0]); byte[] bSalt = this.base64ToByte(currentHashSalt[1]); // Compute the new DIGEST byte[] proposedDigest; try { - proposedDigest = getHash(ITERATION_NUMBER, password, bSalt); + proposedDigest = getHash(password, bSalt); } catch (NoSuchAlgorithmException e) { LOG.error(e.getMessage()); return false; @@ -111,9 +102,7 @@ public class PasswordUtil implements Serializable { /** * From a password, a number of iterations and a salt, returns the * corresponding digest. - * - * @param iterationNb - * int The number of iterations of the algorithm + * * @param password * String The password to encrypt * @param salt @@ -121,16 +110,13 @@ public class PasswordUtil implements Serializable { * @return byte[] The digested password * @throws NoSuchAlgorithmException * If the algorithm doesn't exist - * @throws UnsupportedEncodingException - * the unsupported encoding exception */ - private byte[] getHash(int iterationNb, String password, byte[] salt) - throws NoSuchAlgorithmException, UnsupportedEncodingException { + private byte[] getHash(String password, byte[] salt) throws NoSuchAlgorithmException { MessageDigest digest = MessageDigest.getInstance("SHA-1"); digest.reset(); digest.update(salt); - byte[] input = digest.digest(password.getBytes("UTF-8")); - for (int i = 0; i < iterationNb; i++) { + byte[] input = digest.digest(password.getBytes(StandardCharsets.UTF_8)); + for (int i = 0; i < PasswordUtil.ITERATION_NUMBER; i++) { digest.reset(); input = digest.digest(input); } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/RomawiNumberUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/RomawiNumberUtil.java index ca2487bb..a3dbc394 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/RomawiNumberUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/RomawiNumberUtil.java @@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.util; import java.util.TreeMap; - /** * The Class RomawiNumberUtil. * @@ -10,10 +9,9 @@ import java.util.TreeMap; */ public class RomawiNumberUtil { - final private static TreeMap map = new TreeMap(); + final private static TreeMap map = new TreeMap<>(); static { - map.put(1000, "M"); map.put(900, "CM"); map.put(500, "D"); @@ -27,14 +25,12 @@ public class RomawiNumberUtil { map.put(5, "V"); map.put(4, "IV"); map.put(1, "I"); - } - public final static String toRoman(int number) { + public static String toRoman(int number) { int l = map.floorKey(number); - if (number == l) { + if (number == l) return map.get(number); - } return map.get(l) + toRoman(number - l); } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/StringUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/StringUtil.java index 82d20564..fc13592c 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/StringUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/StringUtil.java @@ -1,17 +1,16 @@ package com.jasamedika.medifirst2000.util; +import lombok.NoArgsConstructor; + /** * String utility class. untuk kebutuhan khusus di luar fungsi-fungsi StringUtil * apache common lib * * @author Roberto */ +@NoArgsConstructor public final class StringUtil { - private StringUtil() { - super(); - } - /** * Format Nomor: Merubah format nomor sesuai dengan panjang yang diminta * Contoh (1,6) -> 000006 @@ -20,105 +19,87 @@ public final class StringUtil { * String * @param length * panjang karakter - * @return */ public static String formatNumber(String angka, int length) { - if (angka == null) { + if (angka == null) return ""; - } - if (length < 1) { + if (length < 1) return angka; - } - String nol = ""; + StringBuilder nol = new StringBuilder(); int finalLength = length - angka.length(); - for (int i = 0; i < finalLength; i++) { - nol += "0"; - } + for (int i = 0; i < finalLength; i++) + nol.append("0"); return nol + angka; } /** * Get Month Name - * - * @return + * */ public static String monthName(int month) { - if (month < 1 || month > 12) { + if (month < 1 || month > 12) return "NOT VALID"; - } - String[] monthNames = { "January", "February", "March", "April", "May", - "June", "July", "August", "September", "October", "November", - "December" }; + String[] monthNames = { "January", "February", "March", "April", "May", "June", "July", "August", "September", + "October", "November", "December" }; return monthNames[month - 1]; } /** * Get Day Name - * - * @return + * */ public static String dayName(int day) { - if (day < 1 || day > 7) { + if (day < 1 || day > 7) return "NOT VALID"; - } - String[] monthNames = { "Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday" }; + String[] monthNames = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; return monthNames[day]; } /** * Get Nama Bulan - * - * @return + * */ public static String namaBulan(int month) { - if (month < 1 || month > 12) { + if (month < 1 || month > 12) return "NOT VALID"; - } - String[] monthNames = { "Januari", "Februari", "Maret", "April", "Mei", - "Juni", "Juli", "Agustus", "September", "Oktober", "November", - "Desember" }; + String[] monthNames = { "Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", + "Oktober", "November", "Desember" }; return monthNames[month]; } /** * Get Nama Hari - * - * @return + * */ public static String namaHari(int day) { - if (day < 1 || day > 7) { + if (day < 1 || day > 7) return "NOT VALID"; - } - String[] monthNames = { "Minggu", "Senin", "Selasa", "Rabu", "Kamis", - "Jumat", "Sabtu" }; + String[] monthNames = { "Minggu", "Senin", "Selasa", "Rabu", "Kamis", "Jumat", "Sabtu" }; return monthNames[day]; } - + /** * Validasi String no telpon Indonesia - * - * @return + * */ - public static boolean validateIndonesiaPhoneNumber(String phoneNo) { - //xxxx 7 atau 8 digit + public static boolean validateIndonesiaPhoneNumber(String phoneNo) { + // xxxx 7 atau 8 digit String pattern1 = "\\d\\d\\d\\d([,\\s])?\\d{7,8}"; - //xxx 6 atau 7 digit + // xxx 6 atau 7 digit String pattern2 = "\\d\\d\\d([,\\s])?\\d{6,7}"; - if (phoneNo.matches(pattern1)) return true; - else if (phoneNo.matches(pattern2)) return true; - else return false; - } - + if (phoneNo.matches(pattern1)) + return true; + else + return phoneNo.matches(pattern2); + } + /** * Validasi String no registrasi (misalnya) - * - * @return + * */ public static boolean validateNoRegistrationExample(String phoneNo) { // REG000001 String pattern = "REG\\d{6}"; - if (phoneNo.matches(pattern)) return true; - else return false; - } + return phoneNo.matches(pattern); + } } diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/SystemUtil.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/SystemUtil.java index 3a3bc34c..97c523c8 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/SystemUtil.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/util/SystemUtil.java @@ -13,79 +13,79 @@ package com.jasamedika.medifirst2000.util; * Copyright (c) 2011 by JirehSoft, Jl. Mengger Girang VI No.2A, * Bandung 40254, Indonesia. All rights reserved. */ - +import lombok.extern.slf4j.Slf4j; /** * JirehSoft class provides common facilities. * * @author Hutagalung */ +@Slf4j public class SystemUtil { - - private static final boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows"); - private static final boolean isOS2 = System.getProperty("os.name").toLowerCase().contains("os/2"); - private static final boolean isMac = System.getProperty("os.name").toLowerCase().contains("mac"); - private static final boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux"); - private static final boolean isSunOs = System.getProperty("os.name").toLowerCase().contains("sunos"); - private static final boolean isAIX = System.getProperty("os.name").toLowerCase().contains("aix"); - private static final boolean isHPUX = System.getProperty("os.name").toLowerCase().contains("hpux"); - private static final boolean isFreeBSD = System.getProperty("os.name").toLowerCase().contains("freebsd"); - - private static Double javaVersion = null; - - public static double getJavaVersion() { - if (javaVersion == null) { - try { - String ver = System.getProperties().getProperty("java.version"); - String version = ""; - boolean firstPoint = true; - - for (int i = 0; i < ver.length(); i++) { - if (ver.charAt(i) == '.') { - if (firstPoint) - version += ver.charAt(i); - firstPoint = false; - } else if (Character.isDigit(ver.charAt(i))) - version += ver.charAt(i); - } - javaVersion = new Double(version); - } catch (NumberFormatException e) { - } - } - return javaVersion; - } - public static boolean isAIX() { - return isAIX; - } + private static final boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows"); + private static final boolean isOS2 = System.getProperty("os.name").toLowerCase().contains("os/2"); + private static final boolean isMac = System.getProperty("os.name").toLowerCase().contains("mac"); + private static final boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux"); + private static final boolean isSunOs = System.getProperty("os.name").toLowerCase().contains("sunos"); + private static final boolean isAIX = System.getProperty("os.name").toLowerCase().contains("aix"); + private static final boolean isHPUX = System.getProperty("os.name").toLowerCase().contains("hpux"); + private static final boolean isFreeBSD = System.getProperty("os.name").toLowerCase().contains("freebsd"); - public static boolean isFreeBSD() { - return isFreeBSD; - } + private static Double javaVersion = null; - public static boolean isHPUX() { - return isHPUX; - } + public static double getJavaVersion() { + if (javaVersion == null) { + try { + String ver = System.getProperties().getProperty("java.version"); + StringBuilder version = new StringBuilder(); + boolean firstPoint = true; + for (int i = 0; i < ver.length(); i++) { + if (ver.charAt(i) == '.') { + if (firstPoint) + version.append(ver.charAt(i)); + firstPoint = false; + } else if (Character.isDigit(ver.charAt(i))) + version.append(ver.charAt(i)); + } + javaVersion = new Double(version.toString()); + } catch (NumberFormatException e) { + log.error(e.getMessage()); + } + } + return javaVersion; + } - public static boolean isLinux() { - return isLinux; - } + public static boolean isAIX() { + return isAIX; + } - public static boolean isMac() { - return isMac; - } + public static boolean isFreeBSD() { + return isFreeBSD; + } - public static boolean isOS2() { - return isOS2; - } + public static boolean isHPUX() { + return isHPUX; + } - public static boolean isSunOs() { - return isSunOs; - } + public static boolean isLinux() { + return isLinux; + } + + public static boolean isMac() { + return isMac; + } + + public static boolean isOS2() { + return isOS2; + } + + public static boolean isSunOs() { + return isSunOs; + } + + public static boolean isWindows() { + return isWindows; + } - public static boolean isWindows() { - return isWindows; - } - } - diff --git a/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-cssd/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-domain/src/main/java/com/jasamedika/medifirst2000/entities/JadwalDokter.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JadwalDokter.java index a8f2013e..7cf15493 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JadwalDokter.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JadwalDokter.java @@ -1,7 +1,7 @@ package com.jasamedika.medifirst2000.entities; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.base.BaseMasterJadwalDokter; +import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.NoArgsConstructor; @@ -11,13 +11,15 @@ import javax.persistence.*; import javax.validation.constraints.NotNull; import java.util.Date; +import static javax.persistence.GenerationType.SEQUENCE; + @Getter @Setter @NoArgsConstructor @Entity @Table(name = "JadwalDokter_M") @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) -public class JadwalDokter extends BaseMasterJadwalDokter { +public class JadwalDokter extends BaseMaster { public JadwalDokter(Ruangan ruangan, Date tanggalJadwal, Pegawai dokter, JadwalPraktek jadwalPraktek) { super(); @@ -27,6 +29,12 @@ public class JadwalDokter extends BaseMasterJadwalDokter { this.tanggalJadwal = tanggalJadwal; } + @Id + @GeneratedValue(strategy = SEQUENCE, generator = "public.jadwaldokter_m_id_seq") + @SequenceGenerator(name = "public.jadwaldokter_m_id_seq", sequenceName = "public.jadwaldokter_m_id_seq", allocationSize = 1) + @Column(name = "id") + protected Integer id; + @ManyToOne @JoinColumn(name = "StatusKehadiran") @Caption(value = "StatusKehadiran") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderSysmex.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderSysmex.java index bb27b2a1..a3a7cd55 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderSysmex.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderSysmex.java @@ -1,6 +1,6 @@ package com.jasamedika.medifirst2000.entities; -import com.jasamedika.medifirst2000.base.BaseBridging; +import com.jasamedika.medifirst2000.base.BaseActive; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; @@ -13,7 +13,7 @@ import static javax.persistence.GenerationType.SEQUENCE; @Setter @Entity @Table(name = "LisOrder") -public class LisOrderSysmex extends BaseBridging { +public class LisOrderSysmex extends BaseActive { @Id @GeneratedValue(strategy = SEQUENCE, generator = "public.LisOrder_id_seq") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderTmpSysmex.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderTmpSysmex.java index 8ad6ace0..6fd8ae40 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderTmpSysmex.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LisOrderTmpSysmex.java @@ -1,6 +1,6 @@ package com.jasamedika.medifirst2000.entities; -import com.jasamedika.medifirst2000.base.BaseBridging; +import com.jasamedika.medifirst2000.base.BaseActive; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; @@ -13,7 +13,7 @@ import static javax.persistence.GenerationType.SEQUENCE; @Setter @Entity @Table(name = "LisOrderTmp") -public class LisOrderTmpSysmex extends BaseBridging { +public class LisOrderTmpSysmex extends BaseActive { @Id @GeneratedValue(strategy = SEQUENCE, generator = "public.LisOrderTmp_id_seq") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NamaPegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NamaPegawai.java index 1590df9c..8ccccc76 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NamaPegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NamaPegawai.java @@ -28,10 +28,6 @@ public class NamaPegawai extends BaseTransaction { @Caption(value = "NamaExternal") private String namaExternal; - @Column(name = "NoRec", nullable = false, length = 100) - @Caption(value = "NoRec") - private String noRec; - @Column(name = "Name", nullable = false, length = 100) @Caption(value = "Name") private String name; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java index b9d1825d..b1d2aab6 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java @@ -1,7 +1,7 @@ package com.jasamedika.medifirst2000.entities; import com.fasterxml.jackson.annotation.JsonBackReference; -import com.jasamedika.medifirst2000.base.BaseMasterPegawai; +import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.NoArgsConstructor; @@ -14,6 +14,7 @@ import java.util.HashSet; import java.util.Set; import static javax.persistence.FetchType.LAZY; +import static javax.persistence.GenerationType.SEQUENCE; import static javax.persistence.TemporalType.DATE; @Getter @@ -21,7 +22,7 @@ import static javax.persistence.TemporalType.DATE; @NoArgsConstructor @Entity @Table(name = "Pegawai_M") -public class Pegawai extends BaseMasterPegawai { +public class Pegawai extends BaseMaster { public Pegawai(String namaLengkap, String namaPanggilan, String nikIntern, String nipPns, String noIdentitas, String npwp, Integer id) { @@ -93,6 +94,12 @@ public class Pegawai extends BaseMasterPegawai { this.unitKerja.setUnitKerja(new UnitKerjaPegawai(unitKerjaPegawai)); } + @Id + @GeneratedValue(strategy = SEQUENCE, generator = "public.pegawai_m_id_seq") + @SequenceGenerator(name = "public.pegawai_m_id_seq", sequenceName = "public.pegawai_m_id_seq", allocationSize = 1) + @Column(name = "id") + protected Integer id; + @Column(name = "Nip") @Caption(value = "Nip") private String nip; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java index 03374082..bdd7afaf 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java @@ -2,9 +2,8 @@ package com.jasamedika.medifirst2000.entities; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.base.BaseMasterProduk; +import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; - import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -16,6 +15,7 @@ import java.util.Set; import static javax.persistence.CascadeType.ALL; import static javax.persistence.FetchType.LAZY; +import static javax.persistence.GenerationType.SEQUENCE; /** * class Produk @@ -27,7 +27,7 @@ import static javax.persistence.FetchType.LAZY; @Entity @NoArgsConstructor @Table(name = "Produk_M") -public class Produk extends BaseMasterProduk { +public class Produk extends BaseMaster { public Produk(String kdProduk, String namaProduk, Integer id, SatuanStandar satuanStandar) { super(); @@ -74,6 +74,12 @@ public class Produk extends BaseMasterProduk { this.keterangan = keterangan; } + @Id + @GeneratedValue(strategy = SEQUENCE, generator = "public.produk_m_id_seq") + @SequenceGenerator(name = "public.produk_m_id_seq", sequenceName = "public.produk_m_id_seq", allocationSize = 1) + @Column(name = "id") + protected Integer id; + @JsonBackReference @OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "produk") private Set produkDetail = new HashSet<>(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StokProdukGlobal.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StokProdukGlobal.java index 0c127a38..d5f2a485 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StokProdukGlobal.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StokProdukGlobal.java @@ -1,12 +1,14 @@ package com.jasamedika.medifirst2000.entities; -import com.jasamedika.medifirst2000.base.BaseMasterStokProdukGlobal; +import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; import javax.persistence.*; +import static javax.persistence.GenerationType.SEQUENCE; + /** * class StokProdukGlobal * @@ -16,7 +18,13 @@ import javax.persistence.*; @Setter @Entity @Table(name = "StokProdukGlobal_M") -public class StokProdukGlobal extends BaseMasterStokProdukGlobal { +public class StokProdukGlobal extends BaseMaster { + + @Id + @GeneratedValue(strategy = SEQUENCE, generator = "public.stokprodukglobal_m_id_seq") + @SequenceGenerator(name = "public.stokprodukglobal_m_id_seq", sequenceName = "public.stokprodukglobal_m_id_seq", allocationSize = 1) + @Column(name = "id") + protected Integer id; @Column(name = "HargaDiscount") @Caption(value = "Harga Discount") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdAlatVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdAlatVO.java index 86a687da..bdba0d64 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdAlatVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdAlatVO.java @@ -14,16 +14,14 @@ import lombok.Setter; @Setter public class CssdAlatVO extends BaseMasterVO { - @Caption(value = "Cssd Alat") - private CssdSetAlatVO cssdSetAlat; + @Caption(value = "Cssd Alat") + private CssdSetAlatVO cssdSetAlat; - private Integer cssdSetAlatId; + private Integer cssdSetAlatId; - @Caption(value = "Nama Alat") - private MapPaketToProdukVO namaAlat; + @Caption(value = "Nama Alat") + private MapPaketToProdukVO namaAlat; - private Integer namaAlatId; - - protected Integer id; + private Integer namaAlatId; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdBmhpVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdBmhpVO.java index 56794765..bd61ff65 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdBmhpVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdBmhpVO.java @@ -14,24 +14,22 @@ import lombok.Setter; @Setter public class CssdBmhpVO extends BaseMasterVO { - @Caption(value = "Cssd Alat") - private CssdSetAlatVO cssdSetAlat; + @Caption(value = "Cssd Alat") + private CssdSetAlatVO cssdSetAlat; - private Integer cssdSetAlatId; + private Integer cssdSetAlatId; - @Caption(value = "Nama Barang") - private ProdukVO namaBarang; + @Caption(value = "Nama Barang") + private ProdukVO namaBarang; - private Integer namaBarangId; + private Integer namaBarangId; - @Caption(value = "Jumlah") - private Integer jumlah; + @Caption(value = "Jumlah") + private Integer jumlah; - @Caption(value = "Satuan") - private SatuanStandarVO satuan; + @Caption(value = "Satuan") + private SatuanStandarVO satuan; - private Integer satuanId; - - protected Integer id; + private Integer satuanId; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdSetAlatVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdSetAlatVO.java index efb1e5c7..b0e977e4 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdSetAlatVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdSetAlatVO.java @@ -17,15 +17,13 @@ import java.util.Set; @Setter public class CssdSetAlatVO extends BaseMasterVO { - @Caption(value = "Set Alat") - private PaketVO paket; + @Caption(value = "Set Alat") + private PaketVO paket; - private Integer paketId; + private Integer paketId; - private Set cssdAlat = new HashSet<>(); + private Set cssdAlat = new HashSet<>(); - private Set cssdBmhp = new HashSet<>(); - - protected Integer id; + private Set cssdBmhp = new HashSet<>(); } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenTemplateVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenTemplateVO.java index 61651d7a..1bfe647d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenTemplateVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenTemplateVO.java @@ -27,8 +27,6 @@ public class DokumenTemplateVO extends BaseMasterVO { private Integer kategoryDokumenId; - protected Integer id; - private String fileLocation; private String fileName; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JadwalPraktikDokterVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JadwalPraktikDokterVO.java index e0f53cef..7144d56f 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JadwalPraktikDokterVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JadwalPraktikDokterVO.java @@ -11,8 +11,6 @@ import javax.validation.constraints.NotNull; @Setter public class JadwalPraktikDokterVO extends BaseMasterVO { - private Integer id; - @NotNull(message = "Kd Jadwal Praktek tidak boleh kosong") @Caption(value = "Object JadwalPraktek") private JadwalPraktekVO jadwalPraktek; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapKebutuhanSaranaToKamarVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapKebutuhanSaranaToKamarVO.java index 5a7e0581..6d08f655 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapKebutuhanSaranaToKamarVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapKebutuhanSaranaToKamarVO.java @@ -8,7 +8,6 @@ import lombok.Setter; @Setter public class MapKebutuhanSaranaToKamarVO extends BaseMasterVO { - private Integer id; private Integer kamarId; private Integer jumlah; private String satuan; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiLaboratRadiologiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiLaboratRadiologiVO.java index 3570fe0f..3a7667ee 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiLaboratRadiologiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiLaboratRadiologiVO.java @@ -12,8 +12,6 @@ import lombok.Setter; @Setter public class MapPegawaiLaboratRadiologiVO extends BaseMasterVO { - protected Integer id; - private Integer pegawaiId; } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingSchedulerVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingSchedulerVO.java index c000c559..ceeee739 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingSchedulerVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingSchedulerVO.java @@ -10,8 +10,6 @@ import java.util.Date; @Setter public class NotifMessagingSchedulerVO extends BaseMasterVO { - private Integer id; - private Date tglKirim; private boolean terkirim; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingVO.java index 2fcbdc71..7c5ecbb5 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifMessagingVO.java @@ -10,8 +10,6 @@ import java.util.Set; @Setter public class NotifMessagingVO extends BaseMasterVO { - private Integer id; - private String nama; private String deskripsi; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifikasiMessageObjekModulVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifikasiMessageObjekModulVO.java index 0d5ca0c6..3c69ff3f 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifikasiMessageObjekModulVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotifikasiMessageObjekModulVO.java @@ -8,8 +8,6 @@ import lombok.Setter; @Setter public class NotifikasiMessageObjekModulVO extends BaseMasterVO { - private Integer id; - private String titleNotifikasi; private String pesanNotifikasi; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java index be288ab2..b6eaad09 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java @@ -26,6 +26,4 @@ public class PegawaiJabatanVO extends BaseMasterVO { private Boolean isPrimary; - private Boolean statusEnabled; - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java index 7d22fa63..2abea1c3 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java @@ -20,6 +20,4 @@ public class RisikoGiziVO extends BaseMasterVO { @Caption(value = "Name") private String name; - protected Integer id; - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StandarPelayananMakananVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StandarPelayananMakananVO.java index 16e2fa83..0458ec70 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StandarPelayananMakananVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StandarPelayananMakananVO.java @@ -8,8 +8,6 @@ import lombok.Setter; @Setter public class StandarPelayananMakananVO extends BaseMasterVO { - protected Integer id; - private Integer ruanganId; private Integer kelasId; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitCostVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitCostVO.java index 6dff296b..9a1f2306 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitCostVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitCostVO.java @@ -25,6 +25,4 @@ public class UnitCostVO extends BaseMasterVO { private Integer ruanganId; - protected Integer id; - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitPengelolaPrakarsaSuratVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitPengelolaPrakarsaSuratVO.java index 8614ebe0..c1048f5d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitPengelolaPrakarsaSuratVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitPengelolaPrakarsaSuratVO.java @@ -16,6 +16,4 @@ public class UnitPengelolaPrakarsaSuratVO extends BaseMasterVO { private String kodeUnitPengelolaPrakarsaSurat; - protected Integer id; - } diff --git a/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-ipsrs/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-it/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-it/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-it/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-k3kl/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-laundry/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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/BaseRestController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 0e73c735..00000000 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.BaseVO; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends - RestPageController { - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = RequestMethod.PUT) - @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/RestPageController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 2cdcfbf0..00000000 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import java.util.Collection; - -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.BaseVO; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - /** - * - * @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( - @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-web/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java deleted file mode 100644 index 9ee2214e..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/BaseRestController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -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.ResponseBody; - -import com.jasamedika.medifirst2000.base.vo.BaseVO; - -import static org.springframework.web.bind.annotation.RequestMethod.*; - -/** - * Base Rest Operation for Controller Class - * - * @author Roberto - */ -public interface BaseRestController extends RestPageController { - - @RequestMapping(value = "/{id}", method = GET) - @ResponseBody - ResponseEntity getVO(@PathVariable("id") String id); - - @RequestMapping(value = "/", method = POST, consumes = { "application/json" }) - @ResponseBody - ResponseEntity addVO(@RequestBody V vo); - - @RequestMapping(value = "/", method = PUT, consumes = { "application/json" }) - @ResponseBody - ResponseEntity editVO(@RequestBody V vo); - -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java deleted file mode 100644 index 732aa616..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/RestPageController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jasamedika.medifirst2000.controller.base; - -import com.jasamedika.medifirst2000.base.vo.BaseVO; -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.ResponseBody; - -import java.util.Collection; - -import static org.springframework.web.bind.annotation.RequestMethod.GET; - -/** - * Base Rest Operation for 'pagination' Controller Class - * - * @author Roberto - */ -public interface RestPageController { - - /** - * - * @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 = GET) - @ResponseBody - ResponseEntity> getAllVOWithQueryString(@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); - -}