From aff6f184e7a38a1674f3067e3f6c3acc92a4fed4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 11:44:52 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java | 7 +-
dao/src/main/java/com/sandu/ximon/dao/mapper/PoleBindingMapper.java | 2
dao/src/main/resources/mapper/IPBroadcastMapper.xml | 6 --
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 77 +++++++++++++------------
dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 65 ++++++++++++++++-----
6 files changed, 93 insertions(+), 66 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
index e0bb4bf..f801748 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
@@ -14,7 +14,7 @@
*/
@Mapper
public interface IPBroadcastMapper extends BaseMapper<BroadcastTerminalV2Entity> {
- List<BroadcastTerminalV2Entity> listAll(Long clientId);
+ List<BroadcastTerminalV2Entity> listAll();
//
// @Insert("insert into broadcast_v2_terminal (id,terminal_name,streetlight_id,exist) values (#{id},#{terminalName},#{streetlightId},#{exist})")
// int insert(BroadcastTerminalV2Entity b);
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleBindingMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleBindingMapper.java
index 89ca6db..931b0d4 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleBindingMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleBindingMapper.java
@@ -16,7 +16,7 @@
* 鏍规嵁缁戝畾鍏崇郴鏌ヨ璁惧褰掑睘
*/
- Pole getPoleByBinding(String type, String Mac,Long userId);
+ Pole getPoleByBinding(String type, Object Mac, Long userId);
}
diff --git a/dao/src/main/resources/mapper/IPBroadcastMapper.xml b/dao/src/main/resources/mapper/IPBroadcastMapper.xml
index 5c54237..f7dca54 100644
--- a/dao/src/main/resources/mapper/IPBroadcastMapper.xml
+++ b/dao/src/main/resources/mapper/IPBroadcastMapper.xml
@@ -25,12 +25,6 @@
LEFT JOIN pole_binding t2 ON t1.id = t2.device_code
AND t2.device_type = 5
LEFT JOIN pole t3 ON t3.id = t2.pole_id
-
- <where>
- <if test="clientId != null">
- AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId})
- </if>
- </where>
</select>
<select id="getBroadcastTerminalList" resultType="com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo">
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index 89a7f60..8b32e4c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,18 +8,17 @@
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.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskAPIUtils;
import com.sandu.ximon.admin.vo.TaskMediaFileVO;
import com.sandu.ximon.admin.vo.TaskTerminalVO;
import com.sandu.ximon.admin.vo.TaskVO;
import com.sandu.ximon.dao.bo.IpVolumeMissionBo;
-import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
-import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
-import com.sandu.ximon.dao.domain.IpVolumeFile;
-import com.sandu.ximon.dao.domain.IpVolumeMission;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -28,6 +28,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Author liuhaonan
@@ -45,9 +46,6 @@
private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
- /*public boolean add1() {
- return broadcastV2TaskTerminalService.save();
- }*/
public boolean addMission(IpVolumeMissionParam missionparam) {
String taskName = missionparam.getMissionName();
@@ -128,6 +126,7 @@
Integer taskId = TaskAPIUtils.addTask(missionparam);
// Integer taskId = 1111;
+ boolean flag;
if (null != taskId && taskId != 0) {
IpVolumeMission byId = getById(taskId);
for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
@@ -174,11 +173,25 @@
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
- return true;
+ flag = true;
} else {
- return false;
+ flag = false;
}
+ /**
+ * IP闊虫煴浠诲姟娣诲姞鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{浠诲姟ID锛�" + taskId
+ + "锛屼换鍔″悕锛�" + taskName
+ + "锛岃澶嘔D闆嗗悎锛�" + missionparam.getTerminalIds()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟娣诲姞", content);
+ /**
+ * IP闊虫煴浠诲姟娣诲姞鏃ュ織璁板綍缁撴潫
+ */
+
+
+ return flag;
}
public Integer updateMission(Integer taskId, IpVolumeMissionParam missionparam) {
@@ -300,11 +313,21 @@
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
- return 0;
-
- } else {
- return result;
}
+ /**
+ * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{浠诲姟ID锛�" + taskId
+ + "锛屼换鍔″悕锛�" + taskName
+ + "锛岃澶嘔D闆嗗悎锛�" + missionparam.getTerminalIds()
+ + "锛屼换鍔＄紪杈戠粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟淇敼", content);
+ /**
+ * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍缁撴潫
+ */
+ return result;
+
}
/**
@@ -324,11 +347,21 @@
broadcastV2TaskFileService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
// broadcastV2TaskTerminalService.removeById(taskId);
- return 0;
- } else {
- return del;
}
+ /**
+ * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鍒犻櫎鐨勪换鍔D锛�" + taskId
+ + "锛屼换鍔″垹闄ょ粨鏋滐細" + del
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴浠诲姟鍒犻櫎", content);
+ /**
+ * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍缁撴潫
+ */
+
+
+ return del;
}
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 b6cd814..726dbb7 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,5 +1,6 @@
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;
@@ -8,11 +9,13 @@
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.domain.Pole;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
@@ -31,13 +35,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);
@@ -62,6 +60,13 @@
save(b);
}
});
+ /**
+ * IP闊虫煴鍚屾鏃ュ織璁板綍寮�濮�
+ */
+ StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴鍚屾", "IP闊虫煴鍚屾璁惧");
+ /**
+ * IP闊虫煴鍚屾鏃ュ織璁板綍缁撴潫
+ */
}
public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
@@ -147,42 +152,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;
}
/**
@@ -235,6 +224,9 @@
* @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("缁堢涓嶅瓨鍦�");
@@ -244,6 +236,15 @@
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;
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
index eca911c..1c8b5a4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
@@ -6,7 +6,6 @@
import com.sandu.ximon.admin.service.DeviceOperationLogService;
import com.sandu.ximon.admin.service.InnerFrameDataService;
import com.sandu.ximon.dao.domain.Pole;
-import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import java.util.ArrayList;
@@ -48,13 +47,13 @@
* @param operation
* @param content
*/
- public static void storeOperationData(List<String> deviceCodeList, String deviceName, String operation, String content) {
+ public static void storeOperationData(List deviceCodeList, String deviceName, String operation, String content) {
if (deviceCodeList == null) {
deviceCodeList = new ArrayList<>();
}
List<String> poleCodeList = new ArrayList<>();
- for (String str : deviceCodeList) {
- Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, str, null);
+ for (Object str : deviceCodeList) {
+ Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, String.valueOf(str), null);
if (pole != null) {
poleCodeList.add(pole.getDeviceCode());
} else {
--
Gitblit v1.9.3