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/IpVolumeService.java | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 51 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 8f4192e..fcdbc2d 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
@@ -5,13 +5,16 @@
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.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.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;
@@ -21,13 +24,7 @@
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
- // private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
-// @Autowired
-// private SysUserRoleService sysUserRoleService;
-// @Autowired
-// private SysUserCompanyService sysUserCompanyService;
-// @Autowired
-// private BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalMapper;
+
@Autowired
private IPBroadcastMapper broadcastTerminalV2EntityMapper;
@@ -35,13 +32,7 @@
* 鍚屾缁堢
*/
public void synchTerminal() {
- List<BroadcastTerminalV2Entity> server;
- //涓虹┖鏄秴绠�
- if (SecurityUtils.getClientId() == null) {
- server = broadcastTerminalV2EntityMapper.listAll(null);
- } else {
- server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
- }
+ List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll();
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
System.out.println(list);
@@ -64,9 +55,15 @@
b.setStreetlightId(0L);
b.setExist(1);
save(b);
-// broadcastTerminalV2EntityMapper.insert(b);
}
});
+ /**
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍寮�濮�
+ */
+ StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴鍚屾", "IP闊虫煴鍚屾璁惧");
+ /**
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍缁撴潫
+ */
}
public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
@@ -92,11 +89,9 @@
}
} else {
if (SecurityUtils.getClientId() == null) {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
- , null, broadcastTerminalV2Param.getBindingState());
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, broadcastTerminalV2Param.getBindingState());
} else {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
- , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
}
}
@@ -154,42 +149,26 @@
}
/**
- * 淇敼缁堢
- * @param params
- * @return 0:鎴愬姛 1:鍚嶇О涓嶈兘涓虹┖
- *//*
- public Integer updateTerminal(BroadcastParams params, Long userId) {
-
- // 鏍￠獙鍚嶇О鍚堟硶鎬�
- if(null == params.getTerminalName() || "".equals(params.getTerminalName())){
- return 1;
- }
- if(null == params.getDefaultVolumn() || params.getDefaultVolumn() < 0) {
- params.setDefaultVolumn(0);
- }
-
- BroadcastTerminalV2Entity b = new BroadcastTerminalV2Entity();
- b.setId(params.getTerminalId());
- b.setTerminalName(params.getTerminalName());
- b.setStreetlightId(params.getStreetlightId());
- b.setExist(1);
- // API璋冪敤淇敼缁堢闊抽噺
- TerminalAPIUtils.changeVol(params.getTerminalId(),params.getDefaultVolumn(),userId);
-
- broadcastTerminalV2Dao.update(b);
- return 0;
- }
-
- */
-
- /**
* 闊抽噺淇敼
*
* @param params
* @return
*/
public boolean changeVol(BroadcastTerminalV2Param params) {
- return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
+ if (params.getId() == null || params.getDefaultVolumn() == null || params.getDefaultVolumn() < 0) {
+ throw new BusinessException("璁惧ID鎴栦慨鏀圭殑闊抽噺鍊间笉姝ｇ‘");
+ }
+
+ boolean flag = TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
+ /**
+ * IP闊虫煴闊抽噺淇敼 鏃ュ織璁板綍寮�濮�
+ */
+// String content = "{璁惧Id:" + params.getId() + "锛屼慨鏀瑰悗闊抽噺锛�" + params.getDefaultVolumn() + "}";
+// StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴闊抽噺淇敼", content);
+ /**
+ * IP闊虫煴闊抽噺淇敼 鏃ュ織璁板綍缁撴潫
+ */
+ return flag;
}
/**
@@ -201,7 +180,11 @@
if (id == null || id.trim().length() == 0) {
return equipmentInfo;
}
- equipmentInfo.setEquipmentMac(id);
+ 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
@@ -238,11 +221,27 @@
* @return
*/
public boolean updateBroadcastTerminalName(String name, Integer id) {
+ if (name == null || name.trim().length() == 0) {
+ throw new BusinessException("璁惧鍚嶄笉鑳戒负绌�");
+ }
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);
+ boolean flag = updateById(byId);
+ /**
+ * IP闊虫煴淇敼璁惧鍚嶇О鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{璁惧Id:" + id + "锛屼慨鏀瑰悗鍚嶇О锛�" + name + "}";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴淇敼璁惧鍚�", content);
+ /**
+ * IP闊虫煴鏀硅澶囧悕绉版棩蹇楄褰曠粨鏉�
+ */
+ return flag;
}
}
--
Gitblit v1.9.3