From edbb2fe4eabbb7c526fb2f7313bead37d38928e2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 15 八月 2022 14:57:16 +0800
Subject: [PATCH] 充电桩上电请求
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 147 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 31 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index 726dbb7..b0ffe3d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -12,10 +11,11 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
-import com.sandu.ximon.admin.vo.TerminalVO;
+import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
-import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
@@ -37,7 +36,7 @@
public void synchTerminal() {
List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll();
- List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
+ List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
System.out.println(list);
list.stream().forEach(item -> {
// 闊虫煴鏈嶅姟鍣ㄧ粓绔疘D
@@ -61,22 +60,62 @@
}
});
/**
- * IP闊虫煴鍚屾鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍寮�濮�
*/
StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴鍚屾", "IP闊虫煴鍚屾璁惧");
/**
- * IP闊虫煴鍚屾鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍缁撴潫
*/
}
- public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ /**
+ * IP闊虫煴鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param order
+ * @param seq
+ * @param broadcastTerminalV2Param
+ * @return
+ */
+ public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.IP_VOLUME_NAME.getCode();
+ case 3:
+ orderByResult = OrderByEnums.IP_VOLUME_POLE_NAME.getCode();
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
}
List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
@@ -98,23 +137,23 @@
}
}
- List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
+ List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
- for (TerminalVO terminalVO : list) {
- if (bean.getId().equals(terminalVO.getId())) {
- bean.setStatus(terminalVO.getStatus());
- bean.setIp(terminalVO.getIp());
- bean.setVolumn(terminalVO.getVolumn());
- bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
- bean.setPower(terminalVO.getPower());
- bean.setDefaultPower(terminalVO.getDefaultPower());
- bean.setLast(terminalVO.getLast());
- bean.setTaskType(terminalVO.getTaskType());
- bean.setTaskID(terminalVO.getTaskID());
+ for (TerminalDto terminalDto : list) {
+ if (bean.getId().equals(terminalDto.getId())) {
+ bean.setStatus(terminalDto.getStatus());
+ bean.setIp(terminalDto.getIp());
+ bean.setVolumn(terminalDto.getVolumn());
+ bean.setDefaultVolumn(terminalDto.getDefaultVolumn());
+ bean.setPower(terminalDto.getPower());
+ bean.setDefaultPower(terminalDto.getDefaultPower());
+ bean.setLast(terminalDto.getLast());
+ bean.setTaskType(terminalDto.getTaskType());
+ bean.setTaskID(terminalDto.getTaskID());
- if (0 == broadcastTerminalV2Param.getWorkState() && 0 == terminalVO.getStatus()) {
+ if (0 == broadcastTerminalV2Param.getWorkState() && 0 == terminalDto.getStatus()) {
broadcastTerminalV2EntityBos_final.add(bean);
- } else if (1 == broadcastTerminalV2Param.getWorkState() && 1 == terminalVO.getStatus()) {
+ } else if (1 == broadcastTerminalV2Param.getWorkState() && 1 == terminalDto.getStatus()) {
broadcastTerminalV2EntityBos_final.add(bean);
}
break;
@@ -126,6 +165,50 @@
} else {
return broadcastTerminalV2EntityBos_final;
}
+ }
+
+ /**
+ * IP闊虫煴鍒楄〃锛堢敤浜庨椤垫暟鎹粺璁★級
+ *
+ * @return
+ */
+ public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalListOnHome() {
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos_final = new ArrayList<>();
+
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, null, 2);
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, SecurityUtils.getUserId(), 2);
+ }
+
+ return broadcastTerminalV2EntityBos;
+ }
+
+ public List<BroadcastTerminalV2EntityBo> newIpTerminalList(String keyword) {
+
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getListTerminalOnBind(SecurityUtils.getClientId(), keyword);
+
+
+ List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
+ for (TerminalDto terminalDto : list) {
+ if (bean.getId().equals(terminalDto.getId())) {
+ bean.setStatus(terminalDto.getStatus());
+ bean.setIp(terminalDto.getIp());
+ bean.setVolumn(terminalDto.getVolumn());
+ bean.setDefaultVolumn(terminalDto.getDefaultVolumn());
+ bean.setPower(terminalDto.getPower());
+ bean.setDefaultPower(terminalDto.getDefaultPower());
+ bean.setLast(terminalDto.getLast());
+ bean.setTaskType(terminalDto.getTaskType());
+ bean.setTaskID(terminalDto.getTaskID());
+ break;
+ }
+ }
+ }
+
+ return broadcastTerminalV2EntityBos;
}
/**
@@ -164,12 +247,12 @@
boolean flag = TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
/**
- * IP闊虫煴淇敼璁惧鍚嶇О鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴闊抽噺淇敼 鏃ュ織璁板綍寮�濮�
*/
- String content = "{璁惧Id:" + params.getId() + "锛屼慨鏀瑰悗闊抽噺锛�" + params.getDefaultVolumn() + "}";
- StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴闊抽噺淇敼", content);
+// String content = "{璁惧Id:" + params.getId() + "锛屼慨鏀瑰悗闊抽噺锛�" + params.getDefaultVolumn() + "}";
+// StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴闊抽噺淇敼", content);
/**
- * IP闊虫煴鏀硅澶囧悕绉版棩蹇楄褰曠粨鏉�
+ * IP闊虫煴闊抽噺淇敼 鏃ュ織璁板綍缁撴潫
*/
return flag;
}
@@ -188,7 +271,7 @@
equipmentInfo.setEquipmentMac(id);
equipmentInfo.setEquipmentName(one.getTerminalName());
}
- TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
+ TerminalDto terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
if (terminalInfo != null) {
//绌洪棽 1銆� 宸ヤ綔涓� 2 鎴栬�� 4銆� 鏂嚎 0锛� 鎶� 閿� 8
switch (terminalInfo.getStatus()) {
@@ -231,9 +314,11 @@
if (byId == null) {
throw new BusinessException("缁堢涓嶅瓨鍦�");
}
- boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
- if (!belong) {
- throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
}
byId.setTerminalName(name);
boolean flag = updateById(byId);
--
Gitblit v1.9.3