From 0d2e4e6b8954d77dd34664f861135ae41f7eb828 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 13 五月 2022 10:31:34 +0800
Subject: [PATCH] 单灯数据直接下载
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 127 ++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 47 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 4e0e624..616ce3a 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
@@ -2,14 +2,18 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
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.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,7 +37,14 @@
* 鍚屾缁堢
*/
public void synchTerminal() {
- List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll("");
+ List<BroadcastTerminalV2Entity> server;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ server = broadcastTerminalV2EntityMapper.listAll(null);
+ } else {
+ server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
+ }
+
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
System.out.println(list);
list.stream().forEach(item -> {
@@ -55,7 +66,6 @@
b.setStreetlightId(0L);
b.setExist(1);
save(b);
-// broadcastTerminalV2EntityMapper.insert(b);
}
});
}
@@ -64,10 +74,9 @@
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
- Long clientId = SecurityUtils.getClientId();
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
- if (2 == broadcastTerminalV2Param.getWorkState()) {
+ if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
@@ -77,9 +86,17 @@
if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
//鍏ㄩ儴
int bindingState = 2;
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, bindingState);
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), bindingState);
+ }
} else {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, broadcastTerminalV2Param.getBindingState());
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
+ }
}
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
@@ -174,49 +191,65 @@
return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
}
- /*public List<BroadcastTerminalV2Entity> getAll(Long userId) {
- Long roleId = sysUserRoleService.queryRoleId(userId);
- Long companyId = sysUserCompanyService.queryCompanyId(userId);
-
-
- List<BroadcastTerminalV2Entity> list = null;
- if(roleId == Constant.SUPER_ADMIN) {
- list = broadcastTerminalV2Dao.getAll();
- }else if(roleId == Constant.ADMIN) {
- list = broadcastTerminalV2Dao.getAllByCompanyId(companyId);
- }else {
- list = broadcastTerminalV2Dao.getAllByUserId(userId);
+ /**
+ * 缁堢璇︽儏
+ */
+ public EquipmentInfomation getIpTerminalDetail(String id) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("IP闊虫煴");
+ if (id == null || id.trim().length() == 0) {
+ return equipmentInfo;
}
- return list;
- }
+ BroadcastTerminalV2Entity one = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, id));
+ if (one != null) {
+ equipmentInfo.setEquipmentMac(id);
+ equipmentInfo.setEquipmentName(one.getTerminalName());
+ }
+ TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
+ if (terminalInfo != null) {
+ //绌洪棽 1銆� 宸ヤ綔涓� 2 鎴栬�� 4銆� 鏂嚎 0锛� 鎶� 閿� 8
+ switch (terminalInfo.getStatus()) {
+ case 1:
+ equipmentInfo.setEquipmentState("绌洪棽");
+ break;
+ case 2:
+ case 4:
+ equipmentInfo.setEquipmentState("宸ヤ綔涓�");
+ break;
+ case 0:
+ equipmentInfo.setEquipmentState("鏂嚎");
+ break;
+ case 8:
+ equipmentInfo.setEquipmentState("鎶ラ敊");
+ break;
+ default:
+ equipmentInfo.setEquipmentState("鏈煡");
- public BroadcastTerminalV2Entity getById(Integer i) {
- return broadcastTerminalV2Dao.getById(i);
- }
-
- public Object getAllWithStatus(Long userId) {
- List<BroadcastTerminalV2Entity> all = getAll(userId);
- for(BroadcastTerminalV2Entity b : all){
- try {
- TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(b.getId());
- if(null == terminalInfo) {
- b.setExist(0);
- }else {
- b.setExist(1);
- }
- b.setStatus(terminalInfo.getStatus());
- b.setIp(terminalInfo.getIp());
- b.setVolumn(terminalInfo.getVolumn());
- b.setDefaultVolumn(terminalInfo.getDefaultVolumn());
- b.setPower(terminalInfo.getPower());
- b.setDefaultPower(terminalInfo.getDefaultPower());
- b.setLast(terminalInfo.getLast());
- b.setTaskType(terminalInfo.getTaskType());
- b.setTaskID(terminalInfo.getTaskID());
- }catch (Exception e) {
- b.setExist(2);
}
+ } else {
+ equipmentInfo.setEquipmentState("鏈煡");
}
- return all;
- }*/
+ return equipmentInfo;
+ }
+
+
+ /**
+ * 鏍规嵁缁堢id鑾峰彇缁堢淇℃伅
+ *
+ * @param name
+ * @param id
+ * @return
+ */
+ public boolean updateBroadcastTerminalName(String name, Integer id) {
+ BroadcastTerminalV2Entity byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("缁堢涓嶅瓨鍦�");
+ }
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
+ byId.setTerminalName(name);
+ return updateById(byId);
+ }
}
--
Gitblit v1.9.3