From 983049db8c084e09f5eaa29f34c2473e3cf68107 Mon Sep 17 00:00:00 2001 From: bynt Date: Wed, 13 Jul 2022 14:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiye/modules/system/domain/WeChatUser.java | 1 - .../system/service/impl/WeChatUserServiceImpl.java | 3 +-- .../service/impl/ConductRecordServiceImpl.java | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java index 1d49e51c..77ee9a6b 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java @@ -21,7 +21,6 @@ import java.util.Date; public class WeChatUser extends BaseEntity { private static final long serialVersionUID = -4755997517585953316L; - @Id @Column(name = "id") @ApiModelProperty(value = "id") diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java index c48e9df5..0f36310e 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java @@ -151,8 +151,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { WeChatResponse weChatResponse = JSONUtil.toBean(getQrCodeResult, WeChatResponse.class); return JSONUtil.toBean - (JSONUtil.toJsonStr - (weChatResponse.getData()), + (JSONUtil.toJsonStr(weChatResponse.getData()), WeChatParseResponse.class).getStatus(); } } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java index 202716bc..befe40be 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java @@ -5,20 +5,18 @@ import com.baiye.feign.UserClient; import com.baiye.module.dao.ConductRecordRepository; import com.baiye.module.entity.ConductRecord; import com.baiye.module.service.ConductRecordService; -import com.baiye.module.service.dto.ConductRecordDto; import com.baiye.module.service.dto.ConductRecordQueryCriteria; import com.baiye.module.service.mapstruct.ConductRecordMapper; import com.baiye.util.QueryHelp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.util.*; -import java.util.stream.Collectors; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; @Service @Slf4j @@ -51,7 +49,9 @@ public class ConductRecordServiceImpl implements ConductRecordService { @Override public Object query(ConductRecordQueryCriteria conductRecordQueryCriteria) { - return conductRecordMapper.toDto(conductRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, conductRecordQueryCriteria, criteriaBuilder))); + Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); + return conductRecordMapper.toDto(conductRecordRepository.findAll + ((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, conductRecordQueryCriteria, criteriaBuilder), sort)); } }