From f89c8d19d96fdbff3081ba4ac48ea3e72168bc59 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 20 五月 2022 15:52:44 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 3 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 aeb3311..1882ddc 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
@@ -12,10 +12,14 @@
import com.sandu.ximon.admin.config.RealtimeServerBean;
import com.sandu.ximon.admin.param.LEDScheduleParam_xixun;
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.Task;
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.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.LedScheduleEntity;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.mapper.LedScheduleEntityMapper;
@@ -89,6 +93,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);
}
@@ -101,7 +114,12 @@
*/
public void ledschedulepush(Integer scheduleId, Long[] lightemitIds) {
- LedScheduleEntity ledScheduleEntity = baseMapper.selectById(scheduleId);
+// LedScheduleEntity ledScheduleEntity = baseMapper.selectById(scheduleId);
+ LedScheduleEntity ledScheduleEntity = getById(scheduleId);
+ if (ledScheduleEntity == null) {
+ throw new BusinessException("璇ュ畾鏃朵换鍔′笉瀛樺湪");
+ }
+// SendCommand sendCommand = new SendCommand();
// SendCommand sendCommand = new SendCommand();
// sendCommand.setTask(ledScheduleEntity.getSchedule());
// String json = new Gson().toJson(sendCommand);
@@ -112,6 +130,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) {
@@ -158,7 +193,7 @@
});
}
//妯＄硦鏌ヨ鍏抽敭瀛楀垽鏂�
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
eq = eq.like(LedScheduleEntity::getName, keyword);
}
@@ -166,4 +201,57 @@
return list(eq);
}
+
+ /**
+ * 瀹氭椂鏌ヨ
+ */
+ public LedScheduleVO getledschedules(Long id) {
+
+ PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);
+
+ String result1 = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
+ 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) {
+ String result = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
+// if(result !=null){
+ GetSchedules getSchedules = new GetSchedules();
+ try {
+ getSchedules = JsonUtil.convertJsonStringToObject(result, GetSchedules.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ LedScheduleVO ledScheduleVO = new LedScheduleVO();
+ ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
+ if (getSchedules.getTask().getName() != null) {
+ ledScheduleVO.setScheduleName(getSchedules.getTask().getName());
+ List<Schedules> list = new ArrayList();
+ list = getSchedules.getTask().getSchedules();
+ for (Schedules schedules : list) {
+
+ ledScheduleVO.setStartTime(schedules.getStartTime());
+ ledScheduleVO.setEndTime(schedules.getEndTime());
+ ledScheduleVO.setStartDate(schedules.getStartDate());
+ ledScheduleVO.setEndDate(schedules.getEndDate());
+ ledScheduleVO.setWeek(schedules.getWeekFilter());
+ }
+ ;
+ } else {
+ ledScheduleVO.setScheduleName("鏃犲畾鏃�");
+ }
+ return ledScheduleVO;
+ } else {
+ LedScheduleVO ledScheduleVO = new LedScheduleVO();
+ ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
+ ledScheduleVO.setScheduleName("璁惧鏈紑鍚�");
+ return ledScheduleVO;
+ }
+
+ }
+
}
--
Gitblit v1.9.3