From 2e91f5c17fb67d24d16365ea4bc91a8d423ce6a0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 六月 2022 14:05:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 76 ++++++++++++++++----------------------
1 files changed, 32 insertions(+), 44 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 2b628fb..52fea61 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -302,41 +302,10 @@
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
-// if (oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
-// //鍏ㄩ儴鎴愬姛
-// return 0;
-// } else if (!closeLight.isEmpty() || !oldPoleFail.isEmpty()) {
-// //鍏崇伅澶辫触 鎴栬�呰鐩栦换鍔″け璐�
-// return 1;
-// } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closeSuccess.isEmpty()) {
-// //缂栬緫鍏ㄩ儴澶辫触
-// return 2;
-// } else {
-// //鍏朵粬鎯呭喌
-// return -1;
-// }
-
-// if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
-// //缂栬緫鎴愬姛
-// return 0;
-// } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
-// //缂栬緫澶辫触
-// return 1;
-// } else {
-// //鍦ㄦ棫浠诲姟鍩虹涓婄紪杈�
-// if (lightTask.getTaskId().equals(newLightTask.getTaskId())) {
-// //鍙湁鏃т换鍔�
-// return 2;
-// } else {
-// //鏈夋柊浠诲姟锛屾湁鏃т换鍔�
-// return 3;
-// }
-// }
-
if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
return "缂栬緫鎴愬姛";
} else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
- throw new BusinessException("缂栬緫澶辫触");
+ throw new BusinessException("缂栬緫澶辫触,璇锋鏌ョ紪杈戠殑璁惧鏄惁鍦ㄧ嚎!");
} else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
} else if (!newPoleFail.isEmpty()) {
@@ -364,16 +333,6 @@
}
public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword, Integer order, Integer seq) {
- LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
- if (StrUtil.isNotBlank(keyword)) {
- wrapper.like(LightTask::getTaskName, keyword);
- }
- //涓嶆槸瓒呯闇�瑕佺瓫閫�
- if (SecurityUtils.getClientId() != null) {
- wrapper.eq(LightTask::getClientId, SecurityUtils.getUserId()).or(w -> {
- w.eq(LightTask::getUserId, SecurityUtils.getUserId());
- });
- }
//鎺掑簭瀛楁
String orderByResult = "task_id";
@@ -403,7 +362,8 @@
String orderBy = orderByResult + " " + orderBySeq;
PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
- List<LightTask> list = list(wrapper);
+ List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);
+
Page<LightTaskDto> page = new Page<>();
BeanUtils.copyProperties(list, page);
@@ -411,6 +371,35 @@
LightTaskDto lightTaskDto = new LightTaskDto();
BeanUtils.copyProperties(lightTask, lightTaskDto);
lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+ //涓嬪彂鎴愬姛鐨勭伅鏉嗘暟閲�
+ Integer successCount = baseMapper.successCount(lightTaskDto.getTaskId());
+ ///浠诲姟涓�荤殑鐏潌鏁伴噺
+ Integer toTalCount = baseMapper.toTalCount(lightTaskDto.getTaskId());
+ if (successCount == null) {
+ successCount = 0;
+ }
+ if (toTalCount == null) {
+ toTalCount = 0;
+ }
+ if (toTalCount == 0) {
+ //浠诲姟涓病鏈夌伅鏉�
+ lightTaskDto.setSyncStatus("鏈悓姝�");
+ } else {
+ //浠诲姟涓湁鐏潌
+ if (successCount == 0) {
+ //涓嬪彂鎴愬姛鏈�0
+ lightTaskDto.setSyncStatus("鏈悓姝�");
+ } else if (successCount != 0 && successCount < toTalCount) {
+ //瀛樺湪涓嬪彂鎴愬姛 浣嗗苟鏈叏閮ㄦ垚鍔�
+ lightTaskDto.setSyncStatus("閮ㄥ垎鍚屾");
+ } else if (toTalCount.equals(successCount) && toTalCount != 0 && successCount != 0) {
+ //鍏ㄩ儴鎴愬姛
+ lightTaskDto.setSyncStatus("宸插悓姝�");
+ } else {
+ //鏈煡绫诲瀷
+ lightTaskDto.setSyncStatus("鍚屾鐘舵�佸嚭閿�");
+ }
+ }
page.add(lightTaskDto);
}
return page;
@@ -677,7 +666,6 @@
for (LightTaskPoleRelationBo bean : list) {
LightTaskDto lightTaskDto = new LightTaskDto();
- //TODO
BeanUtils.copyProperties(bean, lightTaskDto);
lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(bean.getWeek()));
BigDecimal energySaving;
--
Gitblit v1.9.3