From dd15d2d4407c4ace0cfad1c9d5f00ed0ea49557f Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 16:57:19 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index e63de99..cfccca7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -16,6 +16,7 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,13 +65,49 @@
* @param isOnLine
* @return
*/
- public List<PoleLightemitEntity> listLed(String keyword, boolean isOnLine) {
+ public List<PoleLightemitEntity> listLed(String keyword,Integer order,Integer seq, boolean isOnLine) {
List<PoleLightemitEntity> poleLightemitEntityList;
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.LED_S_CODE.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.LED_S_NAME.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.LED_S_POLE_NAME.getCode();
+ break;
+ case 4:
+ orderByResult = OrderByEnums.LED_S_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
//瓒呯
if (SecurityUtils.getClientId() == null) {
- poleLightemitEntityList = poleLightemitDao.listLed(keyword, null);
+ poleLightemitEntityList = poleLightemitDao.listLed(keyword, null,orderBy);
} else {
- poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId());
+ poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(),orderBy);
}
List<PoleLightemitEntity> temp = new ArrayList<>();
@@ -230,8 +267,8 @@
* 鐔欐睕led缂栬緫鏃ュ織璁板綍寮�濮�
*/
List<String> listCode = new ArrayList<>();
- listCode.add(poleLightemit.getLightemitControlCode());
- String content = "{灞忓箷id锛�" + poleLightemit.getLightemitId() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + poleLightemit.getLightemitControlCode() + " }";
+ listCode.add(byId.getLightemitControlCode());
+ String content = "{灞忓箷id锛�" + byId.getLightemitId() + "锛� 灞忓箷鍘熷悕锛�" + byId.getLightemitName() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + byId.getLightemitControlCode() + " }";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕LED缂栬緫", content);
/**
* 鐔欐睕led缂栬緫鏃ュ織璁板綍缁撴潫
--
Gitblit v1.9.3