diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BowidickVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BowidickVO.java new file mode 100644 index 00000000..5a7f4828 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/BowidickVO.java @@ -0,0 +1,52 @@ +package com.jasamedika.medifirst2000.vo; + +import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; + +/** + * @author Salman + * @version 1.0.0 + * @since 17/12/2024 + */ +@Getter +@Setter +public class BowidickVO extends BaseTransactionVO { + + @Caption(value = "Tanggal") + private Date tanggal; + + @Caption(value="Object Mesin") + private MesinVO mesin; + + private Integer mesinId; + + @Caption(value = "Program Mesin") + private String programMesin; + + @Caption(value = "Suhu") + private String suhu; + + @Caption(value = "Hasil") + private String hasil; + + @Caption(value="Object Supervisor") + private PegawaiVO supervisor; + + private Integer supervisorId; + + @Caption(value="Object Operator") + private PegawaiVO operator; + + private Integer operatorId; + + private PencatatanSuhuMesinVO pencatatanSuhuMesin; + + private String pencatatanSuhuMesinId; + + private String keterangan; + +} 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 new file mode 100644 index 00000000..86a687da --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdAlatVO.java @@ -0,0 +1,29 @@ +package com.jasamedika.medifirst2000.vo; + +import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +/** + * @author Salman + * @version 1.0.0 + * @since 17/12/2024 + */ +@Getter +@Setter +public class CssdAlatVO extends BaseMasterVO { + + @Caption(value = "Cssd Alat") + private CssdSetAlatVO cssdSetAlat; + + private Integer cssdSetAlatId; + + @Caption(value = "Nama Alat") + private MapPaketToProdukVO namaAlat; + + private Integer namaAlatId; + + protected Integer id; + +} 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 new file mode 100644 index 00000000..56794765 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdBmhpVO.java @@ -0,0 +1,37 @@ +package com.jasamedika.medifirst2000.vo; + +import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +/** + * @author Salman + * @version 1.0.0 + * @since 17/12/2024 + */ +@Getter +@Setter +public class CssdBmhpVO extends BaseMasterVO { + + @Caption(value = "Cssd Alat") + private CssdSetAlatVO cssdSetAlat; + + private Integer cssdSetAlatId; + + @Caption(value = "Nama Barang") + private ProdukVO namaBarang; + + private Integer namaBarangId; + + @Caption(value = "Jumlah") + private Integer jumlah; + + @Caption(value = "Satuan") + private SatuanStandarVO satuan; + + private Integer satuanId; + + protected Integer id; + +} 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 new file mode 100644 index 00000000..efb1e5c7 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/CssdSetAlatVO.java @@ -0,0 +1,31 @@ +package com.jasamedika.medifirst2000.vo; + +import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import java.util.HashSet; +import java.util.Set; + +/** + * @author Salman + * @version 1.0.0 + * @since 17/12/2024 + */ +@Getter +@Setter +public class CssdSetAlatVO extends BaseMasterVO { + + @Caption(value = "Set Alat") + private PaketVO paket; + + private Integer paketId; + + private Set cssdAlat = new HashSet<>(); + + private Set cssdBmhp = new HashSet<>(); + + protected Integer id; + +} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java index c8427263..4c1763bf 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java @@ -21,7 +21,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -48,11 +48,11 @@ public class AdmisiRencanaPindahRuanganController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when add", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when add", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,13 +68,13 @@ public class AgamaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when update", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when update", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - return getJsonHttptatus(NOT_ACCEPTABLE); + return RestUtil.getJsonHttpStatus(NOT_ACCEPTABLE); } @RequestMapping(value = "/delete-agama/", method = GET, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) @@ -83,18 +85,17 @@ public class AgamaController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when delete", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when delete", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - return getJsonHttptatus(NOT_ACCEPTABLE); + return RestUtil.getJsonHttpStatus(NOT_ACCEPTABLE); } - @SuppressWarnings("unchecked") @RequestMapping(value = "/search-agama", method = GET, produces = APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryString( + public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java index 7c8c69dd..8e36ef1c 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java @@ -23,7 +23,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -49,11 +49,11 @@ public class AlatController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllAlat", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllAlat", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -64,7 +64,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-all-mesin-cuci", method = GET, produces = APPLICATION_JSON_VALUE) @@ -74,7 +74,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-mesin-aset", method = GET, produces = APPLICATION_JSON_VALUE) @@ -84,7 +84,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-satuan", method = GET, produces = APPLICATION_JSON_VALUE) @@ -94,7 +94,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-departemen-laundry", method = GET, produces = APPLICATION_JSON_VALUE) @@ -104,7 +104,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-max-no-mesin", method = GET, produces = APPLICATION_JSON_VALUE) @@ -114,7 +114,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-produkasetid-alatid", method = GET, produces = APPLICATION_JSON_VALUE) @@ -126,7 +126,7 @@ public class AlatController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, OK, mapHeaderMessage); } - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } @RequestMapping(value = "/get-asset-laundry", method = GET, produces = APPLICATION_JSON_VALUE) diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java index 6a9dc1f8..e21be4bf 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java @@ -21,7 +21,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -53,11 +53,11 @@ public class AnamnesisController extends LocaleController } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveAnamnesis", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveAnamnesis", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java index 46e13edc..5893a34b 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java @@ -22,7 +22,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -67,11 +67,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePengajuanUsulanAnggaranBaru", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePengajuanUsulanAnggaranBaru", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -94,11 +94,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveVerifikasiSpekAnggaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveVerifikasiSpekAnggaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -113,11 +113,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when saveUnVerifikasiSpekAnggaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when saveUnVerifikasiSpekAnggaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -130,11 +130,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getPengendaliByUserLogin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getPengendaliByUserLogin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -147,11 +147,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getRuanganByUserLogin", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getRuanganByUserLogin", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -167,11 +167,11 @@ public class AnggaranController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when editPengajuanUsulanAnggaran", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when editPengajuanUsulanAnggaran", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } // end add by Arya 2017-01-19 diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java index 6a75c182..59141275 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java @@ -22,7 +22,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -49,11 +49,11 @@ public class ApresiasiAtasLayananController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when savePemakaianAsuransi", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when savePemakaianAsuransi", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java index be89ef53..0ac4844f 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java @@ -87,7 +87,7 @@ public class AuthenticateController { HttpServletResponse httpResponse) { if (vo.getNamaUser() == null || vo.getKataSandi() == null) { this.mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Username or Password is empty"); - return RestUtil.getJsonHttptatus(HttpStatus.BAD_REQUEST, mapHeaderMessage); + return RestUtil.getJsonHttpStatus(HttpStatus.BAD_REQUEST, mapHeaderMessage); } LOGGER.info("starting sign-in {}", vo.getNamaUser() + " at " + DateUtil.getIndonesianStringDate(new Date())); @@ -97,7 +97,7 @@ public class AuthenticateController { LoginUserVO loginUserVo = loginUserService.signIn(vo); if (loginUserVo == null) { this.mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Username or Password"); - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE, mapHeaderMessage); + return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE, mapHeaderMessage); } GrantedAuthority authority = new SimpleGrantedAuthority("USER"); String token = tokenAuthenticationService.addAuthentication(httpResponse, @@ -124,7 +124,7 @@ public class AuthenticateController { } catch (Exception ex) { LOGGER.error("Signing-in error {}", ex.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED); + return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED); } } @@ -153,7 +153,7 @@ public class AuthenticateController { HttpServletResponse httpResponse) { if (vo.getNamaUser() == null || vo.getKataSandi() == null) { this.mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Username or Password is empty"); - return RestUtil.getJsonHttptatus(HttpStatus.BAD_REQUEST, mapHeaderMessage); + return RestUtil.getJsonHttpStatus(HttpStatus.BAD_REQUEST, mapHeaderMessage); } LOGGER.info("starting sign-in-mobile {}", @@ -164,7 +164,7 @@ public class AuthenticateController { LoginUserVO loginUserVo = loginUserService.signIn(vo); if (loginUserVo == null) { this.mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Username or Password"); - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE, mapHeaderMessage); + return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE, mapHeaderMessage); } GrantedAuthority authority = new SimpleGrantedAuthority("USER"); String token = tokenAuthenticationService.addAuthentication(httpResponse, @@ -202,7 +202,7 @@ public class AuthenticateController { } catch (Exception ex) { LOGGER.error("Signing-in-mobile error {}", ex.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED); + return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java index 419d6097..0d90c341 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java @@ -21,7 +21,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -50,11 +50,11 @@ public class B3RuanganInputDataController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when addBakuMutu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when addBakuMutu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -66,11 +66,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when findAllBakuMutu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when findAllBakuMutu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -83,11 +83,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getBakuMutuParent", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getBakuMutuParent", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -101,11 +101,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when getBakuMutuChild", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when getBakuMutuChild", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -119,11 +119,11 @@ public class BakuMutuController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when bakuMutuById", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when bakuMutuById", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java index b88f70cf..7103fdd4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java @@ -24,7 +24,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -54,11 +54,11 @@ public class BatalRegistrasiController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java index 25e16421..6649cf76 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java @@ -1,118 +1,76 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.BobotIndikator; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.BobotIndikatorService; +import com.jasamedika.medifirst2000.vo.BobotIndikatorVO; +import com.jasamedika.medifirst2000.vo.PasienVO; +import net.kaczmarzyk.spring.data.jpa.domain.Equal; +import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.entities.BobotIndikator; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.BobotIndikatorService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.BobotIndikatorVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +import java.util.Map; -import net.kaczmarzyk.spring.data.jpa.domain.Equal; -import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/bobot-indikator") -public class BobotIndikatorController extends LocaleController -implements IBaseRestController{ +public class BobotIndikatorController extends LocaleController { @Autowired private BobotIndikatorService bobotService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(PegawaiController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - @Override - public ResponseEntity getVO(Integer id) { - return null; - } + private static final Logger LOGGER = LoggerFactory.getLogger(BobotIndikatorController.class); - @Override - public ResponseEntity addVO(BobotIndikatorVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(BobotIndikatorVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value="/find-all/", method= RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findAll( + @RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> findAll( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "take", required = false, defaultValue = "100") Integer take, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) - { - Map result = new HashMap(); - result = bobotService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); + @Spec(path = "id", params = "id", spec = Equal.class) Specification spec) { + Map result = bobotService.findAll(page, take, sort, dir, spec); + return constructListPageResult(result); } - @RequestMapping(value="/save/", method= RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody BobotIndikatorVO vo,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody BobotIndikatorVO vo, + HttpServletRequest request) { + try { Map result = bobotService.save(vo); - if(null!= result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add/update Bobot IKU", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add/update Bobot IKU", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java index 6b0e39c9..30c81680 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BowidickController.java @@ -1,77 +1,66 @@ package com.jasamedika.medifirst2000.controller; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dto.BowidickDto; -import com.jasamedika.medifirst2000.dto.PenerimaanLinenDto; import com.jasamedika.medifirst2000.service.BowidickService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.BowidickVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/bowidick") -public class BowidickController extends LocaleController { +public class BowidickController extends LocaleController { + @Autowired private BowidickService bowidickService; - - @RequestMapping(value="/save-bowidick", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveBowidick( - @RequestBody BowidickDto dto, + + @RequestMapping(value = "/save-bowidick", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> saveBowidick(@RequestBody BowidickDto dto, HttpServletRequest request) { Map result = this.bowidickService.saveBowidick(dto); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(Collections.singletonList(result), OK, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-bowidick", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBowidick( - @RequestParam(value="startDate") String startDate, - @RequestParam(value="endDate") String endDate, - HttpServletRequest request) { - Map result = this.bowidickService.getBowidick(startDate, endDate); - - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - - @RequestMapping(value="/get-bowidick-by-norec", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBowidickByNoRec( - @RequestParam("noRec")String noRec, HttpServletRequest request) { - Map result = this.bowidickService.getBowidickbyNorec(noRec); - - if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } + @RequestMapping(value = "/get-bowidick", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getBowidick(@RequestParam(value = "startDate") String startDate, + @RequestParam(value = "endDate") String endDate, HttpServletRequest request) { + Map result = this.bowidickService.getBowidick(startDate, endDate); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } + + @RequestMapping(value = "/get-bowidick-by-norec", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getBowidickByNoRec(@RequestParam("noRec") String noRec, + HttpServletRequest request) { + Map result = this.bowidickService.getBowidickbyNorec(noRec); + if (!result.isEmpty()) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java index c732f9a0..7c44d658 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BundleSetAlatController.java @@ -1,53 +1,48 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.service.BundleSetAlatService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.BundleSetAlatVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/bundlesetalat") -public class BundleSetAlatController extends LocaleController { +public class BundleSetAlatController extends LocaleController { + @Autowired private BundleSetAlatService bundleSetAlatService; - - @RequestMapping(value="/get-bundle-set-alat", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-bundle-set-alat", method = GET, produces = APPLICATION_JSON_VALUE) public Map getBundleSetAlat(HttpServletRequest request) { - Map result = this.bundleSetAlatService.getBundleSetAlat(); - return result; + return this.bundleSetAlatService.getBundleSetAlat(); } - - @RequestMapping(value="/save-bundle-set-alat", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveDistribusiLinenExternal( - @RequestBody BundleSetAlatVO vo, HttpServletRequest request){ + + @RequestMapping(value = "/save-bundle-set-alat", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> saveDistribusiLinenExternal(@RequestBody BundleSetAlatVO vo, + HttpServletRequest request) { Map result = this.bundleSetAlatService.saveBundleSetAlat(vo); if (!result.isEmpty()) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } - - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CatatanPerkembanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CatatanPerkembanganController.java deleted file mode 100644 index 9b0e2f0d..00000000 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CatatanPerkembanganController.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.jasamedika.medifirst2000.controller; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service. CatatanPerkembanganService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CatatanPerkembanganVO; - -@RestController -@RequestMapping("/catatanPerkembangan") -public class CatatanPerkembanganController extends LocaleController implements IBaseRestController{ - - @Autowired - private CatatanPerkembanganService catatanPerkembanganService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(CatatanPerkembanganController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(CatatanPerkembanganVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(CatatanPerkembanganVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value = "/save-catatan-perkembangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody CatatanPerkembanganVO vo, HttpServletRequest request) { - - try { - Map result=catatanPerkembanganService.saveCatatanPerkembangan(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Catatan Perkembangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Catatan Perkembangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - -// @RequestMapping(value = "/update-catatan-perkembangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) -// public ResponseEntity> editVO(@Valid @RequestBody CatatanPerkembanganVO vo, HttpServletRequest request) { -// -// try { -// Map result=catatanPerkembanganService.updateCatatanPerkembangan(vo); -// if (null != result) -// mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); -// return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); -// } catch (ServiceVOException e) { -// LOGGER.error("Got exception {} when update Catatan Perkembangan", e.getMessage()); -// addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, -// e.getMessage()); -// return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, -// mapHeaderMessage); -// } catch (JpaSystemException jse) { -// LOGGER.error("Got exception {} when update Catatan Perkembangan", jse.getMessage()); -// addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, -// jse.getMessage()); -// return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, -// mapHeaderMessage); -// } -// } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-by-noCm/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoCm(@RequestParam(value = "noCm", required = false, defaultValue = "000000000000001") String noCm,HttpServletRequest request) { - Map result = catatanPerkembanganService.findByNoCm(noCm); - Boolean dataFound=new Boolean((boolean) result.get("dataFound")); - if(dataFound){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - }else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } -} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java index 092b369c..a75f6196 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java @@ -1,140 +1,116 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.base.vo.BaseModelVO; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CekListGedungBangunanHeaderService; +import com.jasamedika.medifirst2000.service.CekListGedungBangunanService; +import com.jasamedika.medifirst2000.vo.CekListGedungBangunanHeaderVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CekListGedungBangunanHeaderService; -import com.jasamedika.medifirst2000.service.CekListGedungBangunanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AkunVO; -import com.jasamedika.medifirst2000.vo.CekListGedungBangunanHeaderVO; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; + @RestController @RequestMapping("/ceklistgedungbangunan") public class CekListGedungBangunanController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CekListGedungBangunanController.class); - + @Autowired private CekListGedungBangunanService cekListGedungBangunanService; - + @Autowired private CekListGedungBangunanHeaderService cekListGedungBangunanHeaderService; - - @RequestMapping(value = "/get-cek-list-gedung-bangunan", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-cek-list-gedung-bangunan", method = GET, produces = APPLICATION_JSON_VALUE) public Map getCekListBangunanGedung(HttpServletRequest request) { - Map data = this.cekListGedungBangunanService.getCekListGedungBangunan(); - return data; + return this.cekListGedungBangunanService.getCekListGedungBangunan(); } - - @RequestMapping(value = "/save-perawatan-gedung/", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePerawatanGedung( - @Valid @RequestBody CekListGedungBangunanHeaderVO vo, - HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/save-perawatan-gedung/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePerawatanGedung(@Valid @RequestBody CekListGedungBangunanHeaderVO vo, + HttpServletRequest request, HttpServletResponse response) { try { - //Map result = cekListGedungBangunanHeaderService.saveTrans(vo); Map result = this.cekListGedungBangunanHeaderService.savePemeliharaanGedung(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when savePerawatanGedung", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePemeliharaanGedung", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePerawatanGedung", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePemeliharaanGedung", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/save-jadwal-perawatan-gedung/", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-jadwal-perawatan-gedung/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJadwalPerawatanGedung( - @Valid @RequestBody CekListGedungBangunanHeaderVO vo, - HttpServletRequest request,HttpServletResponse response) { - + @Valid @RequestBody CekListGedungBangunanHeaderVO vo, HttpServletRequest request, + HttpServletResponse response) { try { Map result = cekListGedungBangunanHeaderService.saveCekListMasterToJadwalGedung(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveJadwalPerawatanGedung", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveCekListMasterToJadwalGedung", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveJadwalPerawatanGedung", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveCekListMasterToJadwalGedung", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/save-jadwal-perawatan-gedung-v1/", - method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON_VALUE, - consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-jadwal-perawatan-gedung-v1/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveJadwalPerawatanGedungV1( - @Valid @RequestBody CekListGedungBangunanHeaderVO vo, - HttpServletRequest request,HttpServletResponse response) { - + @Valid @RequestBody CekListGedungBangunanHeaderVO vo, HttpServletRequest request, + HttpServletResponse response) { try { Map result = cekListGedungBangunanHeaderService.savePenjadwalanGedung(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveJadwalPerawatanGedung", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePenjadwalanGedung", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveJadwalPerawatanGedung", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePenjadwalanGedung", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-cek-list-jadwal-pemeliharan-gedung", - method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON_VALUE) - public Map getCekListPemeliharaanGedung(@RequestParam("noRec")String noRec) { - Map data = this.cekListGedungBangunanHeaderService.getCekListPemeliharanGedungByNoRec(noRec); - return data; + + @RequestMapping(value = "/get-cek-list-jadwal-pemeliharan-gedung", method = GET, produces = APPLICATION_JSON_VALUE) + public Map getCekListPemeliharaanGedung(@RequestParam("noRec") String noRec) { + return this.cekListGedungBangunanHeaderService.getCekListPemeliharanGedungByNoRec(noRec); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java index 0bfcc4a2..09e0daf4 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java @@ -1,95 +1,57 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CetakPengantarSuratService; +import com.jasamedika.medifirst2000.vo.CetakPengantarSuratVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CetakPengantarSuratService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CetakPengantarSuratVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/pengantar-surat") -public class CetakPengantarSuratController extends LocaleController implements IBaseRestController{ - +public class CetakPengantarSuratController extends LocaleController { + + private static final Logger LOGGER = LoggerFactory.getLogger(CetakPengantarSuratController.class); + @Autowired private CetakPengantarSuratService pengantarSuratService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(CetakPengantarSuratController.class); - - @RequestMapping(value = "/save-pengantar-surat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody CetakPengantarSuratVO vo, HttpServletRequest request) { - + + @RequestMapping(value = "/save-pengantar-surat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody CetakPengantarSuratVO vo, + HttpServletRequest request) { try { - Map result=pengantarSuratService.addPengantarSurat(vo); + Map result = pengantarSuratService.addPengantarSurat(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when addPengantarSurat", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when addPengantarSurat", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, - Integer page, Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } - - @Override - public ResponseEntity addVO(CetakPengantarSuratVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(CetakPengantarSuratVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java index 259cbf08..e2486e3a 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java @@ -23,7 +23,7 @@ import java.util.Map; import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; -import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; import static org.springframework.http.HttpStatus.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -48,13 +48,13 @@ public class CheckInController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when save check in", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when addCheckIn", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when save check in", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when addCheckIn", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -70,13 +70,13 @@ public class CheckInController extends LocaleController { return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when get check in by norec", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when findByNoRec", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get check in by norec", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when findByNoRec", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } @@ -94,14 +94,14 @@ public class CheckInController extends LocaleController { } } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when get check in by norec antrian", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when getCheckInByNoRecAntrian", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); - return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get check in by norec antrian", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when getCheckInByNoRecAntrian", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); - return getJsonHttptatus(CONFLICT, mapHeaderMessage); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java index 8e84356f..654567e8 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java @@ -1,114 +1,89 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Map; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CssdBmhpService; +import com.jasamedika.medifirst2000.service.StokProdukGlobalService; +import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO; +import com.jasamedika.medifirst2000.vo.CssdBmhpVO; +import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CssdBmhpService; -import com.jasamedika.medifirst2000.service.StokProdukGlobalService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO; -import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO; -import com.jasamedika.medifirst2000.vo.PermintaanPerbaikanVO; +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +import static org.springframework.http.HttpStatus.*; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/cssd-bmhp") -public class CssdBmhpController extends LocaleController { - - @Autowired - private CssdBmhpService cssdBmhpService; - - @Autowired - private StokProdukGlobalService stokProdukGlobalService; - +public class CssdBmhpController extends LocaleController { + private static final Logger LOGGER = LoggerFactory.getLogger(CssdBmhpController.class); - @RequestMapping(value = "/save-bmhp/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveCssdBmhp(@Valid @RequestBody CssdBmhpHeaderVO vo,HttpServletRequest request,HttpServletResponse response) { - + @Autowired + private CssdBmhpService cssdBmhpService; + + @Autowired + private StokProdukGlobalService stokProdukGlobalService; + + @RequestMapping(value = "/save-bmhp/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveCssdBmhp(@Valid @RequestBody CssdBmhpHeaderVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdBmhpService.saveCssdBmhp(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveCssdBmhp", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveCssdBmhp", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/produksi-bmhp/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> produksiBmhp(@Valid @RequestBody CssdProduksiBmhpHeaderVO vo,HttpServletRequest request,HttpServletResponse response) { - + + @RequestMapping(value = "/produksi-bmhp/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> produksiBmhp(@Valid @RequestBody CssdProduksiBmhpHeaderVO vo, + HttpServletRequest request, HttpServletResponse response) { try { Map result = cssdBmhpService.produksiBmhp(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when produksiBmhp", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when produksiBmhp", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttpStatus(CONFLICT, mapHeaderMessage); } - } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/detail-produk-bmhp", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public Map detailProdukBmhp(@RequestParam(value = "produkId", required = true) Integer produkId) { - Map result = cssdBmhpService.detailProdukBmhp(produkId); - return result; + @RequestMapping(value = "/detail-produk-bmhp", method = GET, produces = APPLICATION_JSON_VALUE) + public Map detailProdukBmhp(@RequestParam(value = "produkId") Integer produkId) { + return cssdBmhpService.detailProdukBmhp(produkId); } - - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/list-barang-bmhp") - @ResponseBody - public Map listBarangBmhp( - @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @RequestParam(value = "take", required = false, defaultValue = "10000000") Integer limit, - @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, - @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @RequestParam(value = "produkId", required = false) Integer produkId) { - Map resultPageMap = cssdBmhpService.listBarangBmhp(page,limit,sort,dir,produkId); - - return resultPageMap; - } - - @SuppressWarnings("unchecked") @RequestMapping(value = "/master-bmhp") @ResponseBody public Map listBarangBmhp( @@ -116,13 +91,9 @@ public class CssdBmhpController extends LocaleController { @RequestParam(value = "take", required = false, defaultValue = "10000000") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { - - Map resultPageMap = cssdBmhpService.masterBmhp(page, limit, sort, dir); - - return resultPageMap; + return cssdBmhpService.masterBmhp(page, limit, sort, dir); } - - @SuppressWarnings("unchecked") + @RequestMapping(value = "/barang-persediaan") @ResponseBody public Map barangPersediaan( @@ -130,17 +101,12 @@ public class CssdBmhpController extends LocaleController { @RequestParam(value = "take", required = false, defaultValue = "10000000") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "id") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { - - Map resultPageMap = cssdBmhpService.barangPersediaan(page, limit, sort, dir); - - return resultPageMap; + return cssdBmhpService.barangPersediaan(page, limit, sort, dir); } - - // Menampilkan Kartu Pengendali Berdasarkan Norec (array) - @RequestMapping(value = "/get-stok-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-stok-by-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) public Map stokProdukGlobal() { - Map result = stokProdukGlobalService.getStokByRuangan(); - return result; + return stokProdukGlobalService.getStokByRuangan(); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java index 7a868a0c..6351eb04 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/util/rest/RestUtil.java @@ -1,16 +1,17 @@ package com.jasamedika.medifirst2000.util.rest; +import com.google.gson.Gson; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; - -import com.google.gson.Gson; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Rest Util Class @@ -20,67 +21,44 @@ import com.google.gson.Gson; public class RestUtil { private static final String CONTENT_TYPE = "Content-Type"; - private static final String ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin"; /** * get JSON response from Object * - * @param src * @param * source class * @return @ResponseEntity */ public static ResponseEntity getJsonResponse(T src) { - HttpHeaders headers = new HttpHeaders(); - //headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get JSON response from Object with HTTP status - * - * @param src - * @param - * source class + * + * @param source class * @return @ResponseEntity */ public static ResponseEntity getJsonResponse(T src, HttpStatus status) { - HttpHeaders headers = new HttpHeaders(); -// headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - Map map=new HashMap(); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + Map map = new HashMap<>(); map.put("data", src); return new ResponseEntity(map, headers, status); } - /** - * - * @param src - * @param status - * @param mapHeaderMessage - * @param - * @return - */ - public static ResponseEntity getJsonResponse(T src, - HttpStatus status, Map mapHeaderMessage) { - - + public static ResponseEntity getJsonResponse(T src, HttpStatus status, + Map mapHeaderMessage) { HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - - Map map=new HashMap(); + Map map = new HashMap<>(); map.put("messages", mapHeaderMessage); map.put("data", src); - //headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); return new ResponseEntity(map, headers, status); } @@ -91,123 +69,87 @@ public class RestUtil { * source class * @return @ResponseEntity */ - public static ResponseEntity getJsonHttptatus(HttpStatus status) { - - return new ResponseEntity(status); - + public static ResponseEntity getJsonHttpStatus(HttpStatus status) { + return new ResponseEntity<>(status); } - - - - public static ResponseEntity getJsonHttptatus(HttpStatus status, - Map mapHeaderMessage) { + public static ResponseEntity getJsonHttpStatus(HttpStatus status, Map mapHeaderMessage) { HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity(headers, status); - + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(headers, status); } - + /** * get JSON response from Set Object * - * @param src * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(Set src) { - HttpHeaders headers = new HttpHeaders(); -// headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } - + /** * get JSON response from Set Object with custom header * - * @param src - * @param mapHeaderMessage * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(Set src, Map mapHeaderMessage) { - HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - }// headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } - + /** * get JSON response from List Object with custom header * - * @param src - * @param mapHeaderMessage * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(List src, Map mapHeaderMessage) { HttpHeaders headers = new HttpHeaders(); - - if (null != mapHeaderMessage) { - for (String key : mapHeaderMessage.keySet()) { + if (null != mapHeaderMessage) + for (String key : mapHeaderMessage.keySet()) headers.add(key, mapHeaderMessage.get(key)); - } - } - -// headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } - /** * get JSON response from List Object * - * @param src * @param * source class * @return @ResponseEntity */ public static ResponseEntity> defaultJsonResponse(List src) { - HttpHeaders headers = new HttpHeaders(); -// headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity>(src, headers, HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(src, headers, OK); } /** * get default JSON response from Object * - * @param src * @return @ResponseEntity */ public static ResponseEntity defaultJsonResponse(Object src) { - Gson gson = new Gson(); - HttpHeaders headers = new HttpHeaders(); -// headers.add(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - headers.set(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); - return new ResponseEntity(gson.toJson(src), headers, - HttpStatus.OK); + headers.set(CONTENT_TYPE, APPLICATION_JSON_VALUE); + return new ResponseEntity<>(gson.toJson(src), headers, OK); } /** @@ -217,9 +159,7 @@ public class RestUtil { * string source JSON * @param type * class type result - * @param - * @return - */ + */ public static T jsonToObject(String strJson, Class type) { Gson gson = new Gson(); return gson.fromJson(strJson, type); @@ -228,9 +168,7 @@ public class RestUtil { /** * convert object to json * - * @param object - * @return - */ + */ public static String toJson(Object object) { Gson gson = new Gson(); return gson.toJson(object);