From 430ec88e92370b785fbed7d0243ba22a6aabf2ce Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 15:37:21 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 239 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 156 insertions(+), 83 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 ca03876..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
@@ -29,13 +29,16 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
+import com.sandu.ximon.dao.bo.LightTaskPoleRelationBo;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
+import com.sandu.ximon.dao.mapper.LightTaskPoleRelationMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -137,7 +140,7 @@
}
@Transactional(rollbackFor = Exception.class)
- public int updateLightTask(Long taskId, LightTaskParam param) {
+ public String updateLightTask(Long taskId, LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
@@ -215,12 +218,16 @@
closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
}
- //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕�
+
if (closePoleFail.size() == 0 && oldPoleFail.size() == 0) {
+ //鏃т换鍔′腑鍏ㄩ儴鍙戦�佹寚浠ゆ垚鍔燂紝鏇存柊鍘熸湰浠诲姟涓殑鏁版嵁
newLightTask.setTaskId(lightTask.getTaskId());
updateById(newLightTask);
} else {
- save(newLightTask);
+ if (!newPoleSuccess.isEmpty() || !oldPoleSuccess.isEmpty()) {
+ //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕欙紝鏂板鏂扮殑浠诲姟鏁版嵁杩涜淇濆瓨
+ save(newLightTask);
+ }
}
/**
@@ -239,7 +246,7 @@
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- for (LightTaskPoleRelation bean : newPoleAll) {
+ for (LightTaskPoleRelation bean : newPoleSuccess) {
bean.setTaskId(newLightTask.getTaskId());
}
//鎴愬姛鐢ㄦ柊鐨勪换鍔D
@@ -257,20 +264,33 @@
}
List<LightTaskPoleRelation> all = new ArrayList<>();
- all.addAll(newPoleAll);
+ all.addAll(newPoleSuccess);
all.addAll(oldPoleSuccess);
all.addAll(oldPoleFail);
all.addAll(closePoleFail);
-
-
-
List<Long> allPoleId = new ArrayList<>();
- allPoleId.addAll(poleIdList);
- allPoleId.addAll(oldList);
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
- lightTaskPoleRelationService.saveBatch(all);
+ for (LightTaskPoleRelation bean : newPoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : oldPoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : oldPoleFail) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : closePoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+
+ if (!allPoleId.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
+
+ }
+ if (!all.isEmpty()) {
+ lightTaskPoleRelationService.saveBatch(all);
+ }
/**
@@ -282,39 +302,17 @@
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
-// 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 ((newPoleSuccess.isEmpty() && newPoleFail.isEmpty())) {
-// if (oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
-// //缂栬緫澶辫触,淇濈暀鍘熷厛浠诲姟娌℃湁鏀瑰彉,鍙湁鏃т换鍔�
-// return 2;
-// } else {
-// //缂栬緫閮ㄥ垎鎴愬姛閮ㄥ垎澶辫触,鏂版棫浠诲姟鍚屾椂瀛樺湪
-// return 3;
-// }
-// } else {
-// return -1;
-// }
-
- return 0;
+ if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
+ return "缂栬緫鎴愬姛";
+ } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
+ throw new BusinessException("缂栬緫澶辫触,璇锋鏌ョ紪杈戠殑璁惧鏄惁鍦ㄧ嚎!");
+ } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
+ return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
+ } else if (!newPoleFail.isEmpty()) {
+ return "鏂颁换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽拷鐣ュ紓甯告搷浣滅殑鐏潌";
+ } else {
+ return "鎿嶄綔寮傚父";
+ }
}
@@ -334,22 +332,38 @@
return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
}
- public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword) {
- 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());
- });
- }
+ public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword, Integer order, Integer seq) {
- if (conditionVO != null) {
- PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
+ //鎺掑簭瀛楁
+ String orderByResult = "task_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.LIGHT_TASK_UPDATE_TIME.getCode();
+ break;
+ default:
+ }
}
- List<LightTask> list = list(wrapper);
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
+ PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
+ List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);
+
Page<LightTaskDto> page = new Page<>();
BeanUtils.copyProperties(list, page);
@@ -357,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;
@@ -613,35 +656,65 @@
*/
public void energy() {
List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
- for (LightTask lightTask : lightTasks) {
- List<LightTaskPoleRelation> list = SpringContextHolder.getBean(LightTaskPoleRelationService.class).list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
- LightTaskDto lightTaskDto = new LightTaskDto();
- BeanUtils.copyProperties(lightTask, lightTaskDto);
- lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+ List<Long> taskIdList = new ArrayList<>();
+ for (LightTask bean : lightTasks) {
+ taskIdList.add(bean.getTaskId());
+ }
+ if (taskIdList.size() != 0) {
+ List<LightTaskPoleRelationBo> list = SpringContextHolder.getBean(LightTaskPoleRelationMapper.class).test(taskIdList);
+ for (LightTaskPoleRelationBo bean : list) {
- BigDecimal energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
- BigDecimal energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
+ LightTaskDto lightTaskDto = new LightTaskDto();
+ BeanUtils.copyProperties(bean, lightTaskDto);
+ lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(bean.getWeek()));
+ BigDecimal energySaving;
+ BigDecimal energy;
+ //鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime yesterday = now.minusDays(1);
+ int week = yesterday.getDayOfWeek().getValue();
+ if (!list.isEmpty()) {
+ //鏈夌粦瀹氱伅鏉� 杩涜璁＄畻
+ if (lightTaskDto.getWeekList().contains(week)) {
+ //浠诲姟鏈夎鏄熸湡鏁� 璁＄畻
+ energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
+ energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
+ } else {
+ //浠诲姟鏃犺鏄熸湡鏁� 杩斿洖
+ energySaving = new BigDecimal(1);
+ energy = BigDecimal.ZERO;
+ }
+ for (int i = 0; i < list.size(); i++) {
+ LightTaskPoleRelation relation = list.get(i);
+ if (relation.getIssueStatus() != 0) {
+ //浠诲姟涓嬪彂澶辫触 杩斿洖
+ energySaving = new BigDecimal(1);
+ energy = BigDecimal.ZERO;
+ }
+ }
+ } else {
+ //鏈粦瀹氱伅鏉� 鐩存帴杩斿洖
+ energySaving = new BigDecimal(1);
+ energy = BigDecimal.ZERO;
+ }
- //鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
- LocalDateTime now = LocalDateTime.now();
- LocalDateTime yesterday = now.minusDays(1);
+ /**
+ * 瀛樺偍鏁版嵁
+ */
+ LightEnergyData lightEnergyData = new LightEnergyData();
+ lightEnergyData.setTaskId(bean.getTaskId());
+ lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ lightEnergyData.setEnergySaving(energySaving);
+ lightEnergyData.setEnergy(energy);
+ lightEnergyData.setUserId(bean.getUserId());
+ lightEnergyData.setClientId(bean.getClientId());
+ lightEnergyData.setPoleId(bean.getPoleId());
+ //淇濆瓨鑳借�楁暟鎹埌鏁版嵁搴�
+ lightEnergyDataService.save(lightEnergyData);
+ }
- LightEnergyData lightEnergyData = new LightEnergyData();
- lightEnergyData.setTaskId(lightTask.getTaskId());
- lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- lightEnergyData.setEnergySaving(energySaving);
- lightEnergyData.setEnergy(energy);
- lightEnergyData.setUserId(lightTask.getUserId());
- lightEnergyData.setClientId(lightTask.getClientId());
-
- //淇濆瓨鑳借�楁暟鎹埌鏁版嵁搴�
- lightEnergyDataService.save(lightEnergyData);
-
- System.out.println(lightEnergyData + "---------------");
- //ID 浠诲姟id
}
}
-
}
--
Gitblit v1.9.3