diff --git a/api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserAddReq.java b/api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserAddReq.java index bfc14da..552c42c 100644 --- a/api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserAddReq.java +++ b/api/src/main/java/com/xiang/app/module/jntyzx/pojo/req/UserAddReq.java @@ -1,7 +1,6 @@ package com.xiang.app.module.jntyzx.pojo.req; import lombok.Data; -import org.checkerframework.checker.units.qual.N; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/converts/UserConverter.java b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/converts/UserConverter.java index bde4d1a..67af4a3 100644 --- a/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/converts/UserConverter.java +++ b/xservice-core/src/main/java/com/xiang/app/modules/jntyzx/converts/UserConverter.java @@ -4,15 +4,29 @@ import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo; import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.Named; import org.mapstruct.factory.Mappers; import java.util.List; +import java.util.Objects; -@Mapper +@Mapper(componentModel = "spring") public interface UserConverter { UserConverter INSTANCE = Mappers.getMapper(UserConverter.class); @Mapping(source = "id", target = "userId") + @Mapping(source = "isOrder", target = "isOrder", qualifiedByName = "isOrder") + @Mapping(source = "isRestriction", target = "isRestriction", qualifiedByName = "isRestrict") JtUserVo convert(UserTokenInfoDO userTokenInfoDO); List convert(List userTokenInfoDOs); + + @Named("isOrder") + default Boolean isOrder(Integer value) { + return Objects.nonNull(value) && Objects.equals(value, 1); + } + + @Named("isRestrict") + default Boolean isRestrict(Integer value) { + return Objects.nonNull(value) && Objects.equals(value, 0); + } } diff --git a/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java b/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java index 298e1d9..037dba8 100644 --- a/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java +++ b/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java @@ -1,5 +1,6 @@ package com.xiang.app.schedule.jntyzx; +import com.alibaba.fastjson.JSON; import com.xiang.app.common.service.dingtalk.JtDingTalkFactory; import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant; import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO; @@ -57,6 +58,7 @@ public class JtVenueSubscribeTask { users.parallelStream().forEach(user -> { try { List placeNameList = venueInfoMap.keySet().stream().sorted(Comparator.comparing(VenueInfoUtils::sortVenueInfo)).toList(); + log.info("场地排序后的集合:{}", JSON.toJSONString(placeNameList)); for (String placeName : placeNameList) { List venueInfoDOList = venueInfoMap.get(placeName); for (int i = 0; i < 10; i++) {