diff --git a/initializer-dao/src/main/java/com/schbrain/initializer/dao/entity/Entity.java b/initializer-dao/src/main/java/com/schbrain/initializer/dao/entity/Entity.java index b687e757054a89474c5af52d9a5509a111b3f544..552894704f19764f011e729f937091ec7497a9ce 100644 --- a/initializer-dao/src/main/java/com/schbrain/initializer/dao/entity/Entity.java +++ b/initializer-dao/src/main/java/com/schbrain/initializer/dao/entity/Entity.java @@ -16,4 +16,6 @@ public class Entity extends BaseEntity { @BizId private String name; + private Integer age; + } diff --git a/initializer-facade/pom.xml b/initializer-facade/pom.xml index 62d16f670c8d6506e6d2c2d8d9a093a2bdaa48e9..976317254490acd6807134d7afb5c82226c3a36f 100644 --- a/initializer-facade/pom.xml +++ b/initializer-facade/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -50,6 +50,10 @@ com.schbrain.framework oss-spring-boot-starter + + org.redisson + redisson-spring-boot-starter + com.schbrain.framework xxl-job-spring-boot-starter @@ -60,4 +64,4 @@ - \ No newline at end of file + diff --git a/initializer-starter/pom.xml b/initializer-starter/pom.xml index c92e4b41c67068afbff574e8c3857e4698ec269c..ace975245aaa9e6dfc1b824f9a9abd0e618105b1 100644 --- a/initializer-starter/pom.xml +++ b/initializer-starter/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/initializer-starter/src/main/resources/application.yaml b/initializer-starter/src/main/resources/application.yaml index 0a7e2d91958370b602fa66de848f308a6e769666..759e95ea0b1fa5708a2ecc1b69a81550ae292782 100644 --- a/initializer-starter/src/main/resources/application.yaml +++ b/initializer-starter/src/main/resources/application.yaml @@ -1,3 +1,8 @@ spring: application: - name: schbrain-initializer \ No newline at end of file + name: schbrain-initializer + kafka: + consumer: + enabled: true + listener: + ack-mode: manual diff --git a/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java b/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java index f09aa6a88466c205c23e480d2e89bdf922eb9069..d324fa015b63e02bef6a58f7479b8faa7b15ddd5 100644 --- a/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java +++ b/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java @@ -1,7 +1,9 @@ package com.schbrain.initializer.web.controller; import cn.hutool.core.util.RandomUtil; +import com.schbrain.common.util.BeanCopyUtils; import com.schbrain.common.util.JacksonUtils; +import com.schbrain.common.util.support.lock.RedisLockUtils; import com.schbrain.framework.autoconfigure.mybatis.base.BaseEntity; import com.schbrain.framework.autoconfigure.mybatis.base.BaseService; import com.schbrain.initializer.dao.entity.Entity; @@ -9,14 +11,12 @@ import com.schbrain.initializer.dao.entity.EntityWithLogicDelete; import com.schbrain.initializer.service.EntityService; import com.schbrain.initializer.service.EntityWithLogicDeleteService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.tuple.Triple; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; +import java.time.LocalDate; +import java.util.*; /** * @author liaozan @@ -32,21 +32,53 @@ public class EntityController { @Autowired private EntityWithLogicDeleteService entityWithLogicDeleteService; - @GetMapping - public void localDateTime(@RequestParam LocalDateTime time) { - System.out.println(time); + @GetMapping("/copy") + public void copy() { + Entity entity = new Entity(); + entity.setId(1L); + Entity copied = BeanCopyUtils.copy(entity, Entity.class); + System.out.println(copied); + } + + @GetMapping("/time") + public Triple dateTime(@RequestParam Date date, + @RequestParam LocalDate dateTime, + @RequestBody Entity entity) { + log.info("date: {}", date); + log.info("dateTime: {}", dateTime); + return Triple.of(date, dateTime, entity); + } + + @GetMapping("/lock") + public void lock() { + RedisLockUtils.executeWithLock("lock", () -> System.out.println("lock")); } @GetMapping("/bizId") public void bizId() { + String name = entityService.getById(106L, Entity::getName); + System.out.println(JacksonUtils.toPrettyJsonString(name)); + Entity entity = entityService.getByBizId("8352707733"); System.out.println(JacksonUtils.toPrettyJsonString(entity)); - List entities = entityService.listByBizIds(List.of("8352707733")); + Integer age = entityService.getByBizId("8352707733", Entity::getAge); + System.out.println(age); + + Long id = entityService.getByBizId("8352707733", Entity::getId); + System.out.println(id); + + List entities = entityService.listByBizIds(List.of("8352707733", "1119254675595816960")); System.out.println(JacksonUtils.toPrettyJsonString(entities)); - Map entityMap = entityService.getMapByBizIds(List.of("8352707733")); + Map entityMap = entityService.getMapByBizIds(List.of("8352707733", "1119254675595816960")); System.out.println(JacksonUtils.toPrettyJsonString(entityMap)); + + List names = entityService.listByBizIds(List.of("8352707733", "1119254675595816960"), Entity::getName); + System.out.println(JacksonUtils.toPrettyJsonString(names)); + + List nameList = entityService.listByIds(List.of(37L, 106L, 107L), Entity::getName); + System.out.println(JacksonUtils.toPrettyJsonString(nameList)); } @GetMapping("/entity") diff --git a/pom.xml b/pom.xml index 470f796e2bddf84860e4b230bb26f7e41d4975d7..bc5b6601b8a34606217b9453d2029fbbbe177dbf 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.schbrain.framework schbrain-parent - 3.0.5-SNAPSHOT + 3.0.8-SNAPSHOT com.schbrain @@ -82,4 +82,4 @@ - \ No newline at end of file +