From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 20 五月 2025 16:57:11 +0800 Subject: [PATCH] 新增充电桩 --- zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java index 399ba84..e3d9a69 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java @@ -2,7 +2,9 @@ import com.zy.acs.framework.common.Cools; import com.zy.acs.manager.manager.enums.BusStsType; +import com.zy.acs.manager.manager.enums.TaskStsType; import com.zy.acs.manager.manager.service.BusStsService; +import com.zy.acs.manager.manager.service.TaskStsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,10 +30,13 @@ @Autowired private BusStsService busStsService; + @Autowired + private TaskStsService taskStsService; @PostConstruct public void init() { set(BusStsType.class, field -> busStsService.selectByUuid(field).getId()); + set(TaskStsType.class, field -> taskStsService.selectByUuid(field).getId()); } public void set(Class<? extends DataFieldSortFunc> cls, SelectSupport support) { @@ -49,13 +54,16 @@ } } - public String getSql(Class<? extends DataFieldSortFunc> cls, String fieldName) { + public String getOrderBySql(Class<? extends DataFieldSortFunc> cls, String fieldName) { + return getOrderBySql(cls, fieldName, "create_time"); + } + + public String getOrderBySql(Class<? extends DataFieldSortFunc> cls, String fieldName, String timeField) { String sql = map.get(cls); if (!Cools.isEmpty(sql)) { - return "ORDER BY FIELD(" + fieldName + ", " + sql + ") ASC, create_time DESC"; + return "ORDER BY FIELD(" + fieldName + ", " + sql + ") ASC, " + timeField + " DESC"; } return ""; } - } -- Gitblit v1.9.1