Browse Source

Complete-API

new-feature
Viet.LeQ2 1 year ago
parent
commit
7a77ce9873
4 changed files with 13 additions and 11 deletions
  1. BIN
      build/libs/smart-farm-0.0.1-SNAPSHOT.war
  2. +1
    -1
      src/main/java/vn/azteam/tpf/domain/TBCodeDetails.java
  3. +4
    -3
      src/main/java/vn/azteam/tpf/service/impl/TBCodeDetailsImpl.java
  4. +8
    -7
      src/main/java/vn/azteam/tpf/web/rest/TBCodeResource.java

BIN
build/libs/smart-farm-0.0.1-SNAPSHOT.war View File


+ 1
- 1
src/main/java/vn/azteam/tpf/domain/TBCodeDetails.java View File

@Column(name = "tb_code_id", insertable = false, updatable = false) @Column(name = "tb_code_id", insertable = false, updatable = false)
private Long tbCodeId; private Long tbCodeId;


@ManyToOne(fetch = FetchType.LAZY)
@ManyToOne(fetch = FetchType.EAGER)
@JsonIgnoreProperties("") @JsonIgnoreProperties("")
@JsonIgnore @JsonIgnore
@JoinColumn(name = "tb_code_id") @JoinColumn(name = "tb_code_id")

+ 4
- 3
src/main/java/vn/azteam/tpf/service/impl/TBCodeDetailsImpl.java View File

Pageable pageable, Pageable pageable,
Boolean isRequestedFromWeb) { Boolean isRequestedFromWeb) {
// Optional<TBCropDTO> tBCropDTO = tBCropService.findOne(id); // Optional<TBCropDTO> tBCropDTO = tBCropService.findOne(id);
if (!userRoleUtil.currentUserHasPermissionByCropId(tBCropDTO.getId())) {
throw new BadRequestAlertException("1018", ENTITY_NAME, "1018");
}

// if (!userRoleUtil.currentUserHasPermissionByCropId(tBCropDTO.getId())) {
// throw new BadRequestAlertException("1018", ENTITY_NAME, "1018");
// }
Optional<UserDTO> currentUser = userService.getCurrentUserDTO(); Optional<UserDTO> currentUser = userService.getCurrentUserDTO();
TBCodeDetailsAndActivityDTO tbCodeDetailsAndActivityDTO = new TBCodeDetailsAndActivityDTO(); TBCodeDetailsAndActivityDTO tbCodeDetailsAndActivityDTO = new TBCodeDetailsAndActivityDTO();
tbCodeDetailsAndActivityDTO.setTbCropDTO(tBCropDTO); tbCodeDetailsAndActivityDTO.setTbCropDTO(tBCropDTO);

+ 8
- 7
src/main/java/vn/azteam/tpf/web/rest/TBCodeResource.java View File



//Authorize get list crop by customer of current user //Authorize get list crop by customer of current user
List<TBCodeDTO> result = page.getContent().stream() List<TBCodeDTO> result = page.getContent().stream()
.filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
&& userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
// .filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
// && userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
.sorted(Comparator.comparing( .sorted(Comparator.comparing(
TBCodeDTO::getCreatedDate, TBCodeDTO::getCreatedDate,
Comparator.nullsFirst(Comparator.naturalOrder())).reversed()) Comparator.nullsFirst(Comparator.naturalOrder())).reversed())


//Authorize get list crop by customer of current user //Authorize get list crop by customer of current user
List<TBCodeDTO> result = page.getContent().stream() List<TBCodeDTO> result = page.getContent().stream()
.filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
&& userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
// .filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
// && userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
.sorted(Comparator.comparing( .sorted(Comparator.comparing(
TBCodeDTO::getCreatedDate, TBCodeDTO::getCreatedDate,
Comparator.nullsFirst(Comparator.naturalOrder())).reversed()) Comparator.nullsFirst(Comparator.naturalOrder())).reversed())
@PostMapping("/tb-codes/create/activity") @PostMapping("/tb-codes/create/activity")
@Timed @Timed
public ResponseEntity<TBActivityDTO> createActivityForTBCode(@RequestBody ActivityCodeCreationDTO public ResponseEntity<TBActivityDTO> createActivityForTBCode(@RequestBody ActivityCodeCreationDTO
activityCodeCreationDTO) throws IOException {
activityCodeCreationDTO)
throws URISyntaxException {


log.debug("REST request to save TBActivityDTO : {}", activityCodeCreationDTO); log.debug("REST request to save TBActivityDTO : {}", activityCodeCreationDTO);
//Set created by to current user login //Set created by to current user login
activityDTO.setCropId(activityCodeCreationDTO.getTbCropId()); activityDTO.setCropId(activityCodeCreationDTO.getTbCropId());
activityDTO.setCreatedDate(Instant.now()); activityDTO.setCreatedDate(Instant.now());
TBActivityDTO result = tBActivityService.save(activityDTO); TBActivityDTO result = tBActivityService.save(activityDTO);
return ResponseEntity.badRequest()
.headers(HeaderUtil.createEntityUpdateAlert("TBActivity", "Created activity success!"))
return ResponseEntity.created(new URI("/tb-codes/create/activity" + result.getId()))
.headers(HeaderUtil.createEntityCreationAlert("TBActivity", result.getId().toString()))
.body(result); .body(result);
} }



Loading…
Cancel
Save