浏览代码

Update predecate package and swagger

master
lslesinh 2 年前
父节点
当前提交
ceafeaca6a
共有 5 个文件被更改,包括 15 次插入19 次删除
  1. +4
    -2
      gradle/profile_dev.gradle
  2. +1
    -1
      gradle/profile_prod.gradle
  3. +7
    -5
      src/main/java/vn/azteam/tpf/TPFApp.java
  4. +2
    -11
      src/main/java/vn/azteam/tpf/web/rest/TBCropResource.java
  5. +1
    -0
      src/main/resources/config/application-dev.yml

+ 4
- 2
gradle/profile_dev.gradle 查看文件

import org.gradle.internal.os.OperatingSystem import org.gradle.internal.os.OperatingSystem


apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'com.moowork.node'
apply plugin: 'com.github.node-gradle.gulp'


dependencies { dependencies {
compile "org.springframework.boot:spring-boot-devtools" compile "org.springframework.boot:spring-boot-devtools"
if (project.hasProperty('tls')) { if (project.hasProperty('tls')) {
profiles += ',tls' profiles += ',tls'
} }

if (project.hasProperty('swagger')) {
profiles += ',swagger'
}
bootRun { bootRun {
args = [] args = []
} }

+ 1
- 1
gradle/profile_prod.gradle 查看文件

apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'com.gorylenko.gradle-git-properties' apply plugin: 'com.gorylenko.gradle-git-properties'
apply plugin: 'com.moowork.node'
apply plugin: 'com.github.node-gradle.gulp'


dependencies { dependencies {
testCompile "com.h2database:h2" testCompile "com.h2database:h2"

+ 7
- 5
src/main/java/vn/azteam/tpf/TPFApp.java 查看文件



@SpringBootApplication @SpringBootApplication
@EnableConfigurationProperties({LiquibaseProperties.class, ApplicationProperties.class}) @EnableConfigurationProperties({LiquibaseProperties.class, ApplicationProperties.class})
@SecurityScheme(
name = "Authorization",
type = SecuritySchemeType.APIKEY,
in = SecuritySchemeIn.HEADER
)
//@SecurityScheme(
// name = "api",
// type = SecuritySchemeType.HTTP,
// bearerFormat = "JWT",
// scheme = "bearer",
// in = SecuritySchemeIn.HEADER
//)
public class TPFApp { public class TPFApp {


private static final Logger log = LoggerFactory.getLogger(TPFApp.class); private static final Logger log = LoggerFactory.getLogger(TPFApp.class);

+ 2
- 11
src/main/java/vn/azteam/tpf/web/rest/TBCropResource.java 查看文件

*/ */
@RestController @RestController
@RequestMapping("/api") @RequestMapping("/api")
@SecurityRequirement(name = "api")
//@SecurityRequirement(name = "api")
public class TBCropResource { public class TBCropResource {


private final Logger log = LoggerFactory.getLogger(TBCropResource.class); private final Logger log = LoggerFactory.getLogger(TBCropResource.class);
Comparator.nullsFirst(Comparator.naturalOrder())).reversed()) Comparator.nullsFirst(Comparator.naturalOrder())).reversed())
.collect(Collectors.toList()); .collect(Collectors.toList());


//Authorize get list crop by current user
// result = result.stream()
// .filter(item -> userRoleUtil.currentUserHasPermissionByCropId(item.getId()))
// .collect(Collectors.toList());
Page<TBCropDTO> pageResult = pageableUtil.changeTBCropDTOToPageFromList(result, pageable); Page<TBCropDTO> pageResult = pageableUtil.changeTBCropDTOToPageFromList(result, pageable);
for(TBCropDTO itemResult : result) { for(TBCropDTO itemResult : result) {
logger.error("Start date: " + itemResult.getStartDate()); logger.error("Start date: " + itemResult.getStartDate());
@GetMapping("/tb-crops-scan-qrCode/{qrCode}") @GetMapping("/tb-crops-scan-qrCode/{qrCode}")
@Timed @Timed
public ResponseEntity<TBCropDetailDTO> getTBCropScanQRCode(@PathVariable String qrCode, Pageable pageable) { public ResponseEntity<TBCropDetailDTO> getTBCropScanQRCode(@PathVariable String qrCode, Pageable pageable) {
Optional<UserDTO> currentUser = userService.getCurrentUserDTO();
Long currentUserId = currentUser.get().getId();

TBCropCriteria tbCropCriteria = new TBCropCriteria(); TBCropCriteria tbCropCriteria = new TBCropCriteria();
StringFilter qrCodeFilter = new StringFilter(); StringFilter qrCodeFilter = new StringFilter();
qrCodeFilter.setEquals(qrCode); qrCodeFilter.setEquals(qrCode);
tbCropCriteria.setQrCode(qrCodeFilter); tbCropCriteria.setQrCode(qrCodeFilter);

List<TBCropDTO> tBCropDTOs = tBCropQueryService.findByCriteria(tbCropCriteria); List<TBCropDTO> tBCropDTOs = tBCropQueryService.findByCriteria(tbCropCriteria);
List<TBCropDTO> listTBCropDTOs = new ArrayList<>();
List<TBCropDTO> listTBCropDTOs;
if (tBCropDTOs.size() > 0) { if (tBCropDTOs.size() > 0) {
//@CUONGLT - Filter scope customer's data
listTBCropDTOs = tBCropDTOs.stream() listTBCropDTOs = tBCropDTOs.stream()
.filter(item -> userRoleUtil.currentUserHasPermissionByCropId(item.getId())) .filter(item -> userRoleUtil.currentUserHasPermissionByCropId(item.getId()))
.collect(Collectors.toList()); .collect(Collectors.toList());

+ 1
- 0
src/main/resources/config/application-dev.yml 查看文件

prepStmtCacheSize: 250 prepStmtCacheSize: 250
prepStmtCacheSqlLimit: 2048 prepStmtCacheSqlLimit: 2048
useServerPrepStmts: true useServerPrepStmts: true
maximum-pool-size: 20
jpa: jpa:
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
database: MYSQL database: MYSQL

正在加载...
取消
保存