From 72046386cf8a85ad7dae79d82485fa60c2c421e6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 05 七月 2022 18:25:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
index fbf1548..d89f0f9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -14,13 +14,15 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.request.Schedules;
+import com.sandu.ximon.admin.utils.request.TaskSchedules;
import com.sandu.ximon.admin.utils.request.requestbody.GetSchedules;
import com.sandu.ximon.admin.utils.request.requestbody.Task;
-import com.sandu.ximon.admin.utils.request.TaskSchedules;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.LedScheduleEntity;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LedScheduleEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -92,6 +94,15 @@
ledScheduleEntity.setClientId(clientService.getClientId());
}
}
+
+ /**
+ * 鐔欐睕瀹氭椂鏇存敼 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐔欐睕瀹氭椂id锛�" + ledScheduleEntity.getId() + ",鐔欐睕瀹氭椂鍚嶇О锛�" + ledScheduleEntity.getName() + "鐔欐睕瀹氭椂鍐呭锛�" + JSON.toJSONString(ledScheduleEntity.getSchedule()) + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂浠诲姟鏇存敼", content);
+ /**
+ * 鐔欐睕瀹氭椂鏇存敼 鏃ュ織璁板綍缁撴潫
+ */
return this.save(ledScheduleEntity);
}
@@ -120,6 +131,23 @@
lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), ledScheduleEntity.getSchedule());
}
}
+
+ /**
+ * 鐔欐睕瀹氭椂鎺ㄩ�� 鏃ュ織璁板綍寮�濮�
+ */
+ String message = "";
+ List<String> listCode = new ArrayList<>();
+
+ for (PoleLightemitEntity entity : poleLightemitEntities) {
+
+ listCode.add(entity.getLightemitControlCode());
+ message += "[灞忓箷Code:" + entity.getLightemitControlCode() + "灞忓箷鍚嶇О:" + entity.getLightemitName() + "],";
+ }
+ String content = "{鐔欐睕瀹氭椂id锛�" + ledScheduleEntity.getId() + ",鐔欐睕瀹氭椂鍚嶇О锛�" + ledScheduleEntity.getName() + "鐔欐睕灞忓箷淇℃伅锛�" + message + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鎺ㄩ�佺啓姹涘畾鏃朵换鍔�", content);
+ /**
+ * 鐔欐睕瀹氭椂浠诲姟鎺ㄩ�� 鏃ュ織璁板綍缁撴潫
+ */
}
public boolean updateSchedule(LEDScheduleParam_xixun paramXixun) {
@@ -157,7 +185,7 @@
* @param keyword
* @return
*/
- public List listSchedule(BaseConditionVO baseConditionVO, String keyword) {
+ public List listSchedule(BaseConditionVO baseConditionVO,Integer order,Integer seq, String keyword) {
LambdaQueryWrapper<LedScheduleEntity> eq = Wrappers.lambdaQuery(LedScheduleEntity.class);
//鐢ㄦ埛绫诲瀷鍒ゆ柇
if (SecurityUtils.getClientId() != null) {
@@ -170,7 +198,34 @@
eq = eq.like(LedScheduleEntity::getName, keyword);
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.LED_S_PLAY_PLAN_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;
+
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),orderBy);
return list(eq);
}
@@ -183,14 +238,14 @@
PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);
String result1 = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
- if(result1.indexOf("not open")!=-1){
+ if (result1.indexOf("not open") != -1) {
LedScheduleVO notOpen = new LedScheduleVO();
notOpen.setLedName(poleLightemitEntity.getLightemitName());
notOpen.setScheduleName("璁惧鏈紑鍚�");
return notOpen;
}
boolean flag = result1.contains("exist");
- if(flag!=true) {
+ if (flag != true) {
String result = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
// if(result !=null){
GetSchedules getSchedules = new GetSchedules();
@@ -218,7 +273,7 @@
ledScheduleVO.setScheduleName("鏃犲畾鏃�");
}
return ledScheduleVO;
- }else {
+ } else {
LedScheduleVO ledScheduleVO = new LedScheduleVO();
ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
ledScheduleVO.setScheduleName("璁惧鏈紑鍚�");
--
Gitblit v1.9.3