From f03159b37465b246141abaa2fb2f1f725f398278 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 18 五月 2022 10:24:58 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 12 +++---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 7 +--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 9 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 15 +++----
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 12 +++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 16 ++++----
9 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 754a7ce..8b78eca 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -191,7 +191,7 @@
@GetMapping(value = "/logout")
public ResponseVO<Object> LogOut() {
String content = "鐢ㄦ埛鍚嶏細" + SecurityUtils.getUsername();
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛閫�鍑虹櫥褰�", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄧ鐞嗗憳閫�鍑虹櫥褰�", content);
String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
redisService.set(key, null);
return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 2c6278f..00cb0e3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -8,7 +8,6 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.entity.ProgramPro;
@@ -408,13 +407,13 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
/**
- * 鐔欐睕瀹氭椂鍒犻櫎
+ * 鐔欐睕瀹氭椂鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
String content = "{鍒犻櫎鐨勭啓姹涘畾鏃秈d锛�" + ids + " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂鍒犻櫎", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂浠诲姟鍒犻櫎", content);
/**
- * 鐔欐睕瀹氭椂鍒犻櫎
+ * 鐔欐睕瀹氭椂鍒犻櫎 鏃ュ織璁板綍缁撴潫
*/
return ResponseUtil.success(scheduleService.removeByIds(ids));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 258ac6a..62c74b9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
@@ -16,11 +15,13 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.bo.MenuNode;
-import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.AdminRoleRelation;
+import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,7 +82,7 @@
/**
* 娣诲姞绠＄悊鍛樻棩蹇楄褰曞紑濮�
*/
- String content = "鏂版敞鍐岀敤鎴凤細" + param.getUsername();
+ String content = "鏂版敞鍐岀鐞嗗憳锛�" + param.getUsername();
StoreOperationRecordsUtils.storeOperationData(null, null, "娣诲姞绠＄悊鍛�", content);
/**
* 娣诲姞绠＄悊鍛樻棩蹇楄褰曠粨鏉�
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
index 0635b37..42252b8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -50,12 +50,12 @@
}
/**
- * c3鍏呯數妗╄垂鐜囨洿鏀规棩蹇楄褰曞紑濮�
+ * c3鍏呯數妗╄垂鐜囨洿鏀� 鏃ュ織璁板綍寮�濮�
*/
String content = "c3鍏呯數妗╄垂鐜囨洿鏀癸細" + JSON.toJSONString(chargeEntities);
StoreOperationRecordsUtils.storeOperationData(null, null, "c3鍏呯數妗╄垂鐜囨洿鏀�", content);
/**
- * c3鍏呯數妗╄垂鐜囨洿鏀规棩蹇楄褰曠粨鏉�
+ * c3鍏呯數妗╄垂鐜囨洿鏀� 鏃ュ織璁板綍缁撴潫
*/
return true;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 59ee07a..8555241 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -97,12 +97,12 @@
}
/**
- * 娣诲姞绠＄悊鍛樻棩蹇楄褰曞紑濮�
+ * 娣诲姞鏅�氱敤鎴� 鏃ュ織璁板綍寮�濮�
*/
String content = "鏂版敞鍐岀敤鎴凤細" + addClientPrarm.getClientName();
StoreOperationRecordsUtils.storeOperationData(null, null, "娣诲姞鏅�氱敤鎴�", content);
/**
- * 娣诲姞绠＄悊鍛樻棩蹇楄褰曠粨鏉�
+ * 娣诲姞鏅�氱敤鎴� 鏃ュ織璁板綍缁撴潫
*/
return flag;
@@ -158,12 +158,12 @@
client.setMobile(updateClientPrarm.getMobile());
/**
- * 娣诲姞绠＄悊鍛樻棩蹇楄褰曞紑濮�
+ * 缂栬緫鏅�氱敤鎴� 鏃ュ織璁板綍寮�濮�
*/
String content = "缂栬緫鏅�氱敤鎴凤細" + client.getClientName() + "鐢ㄦ埛id锛�" + id;
StoreOperationRecordsUtils.storeOperationData(null, null, "缂栬緫鏅�氱敤鎴�", content);
/**
- * 娣诲姞绠＄悊鍛樻棩蹇楄褰曠粨鏉�
+ * 缂栬緫鏅�氱敤鎴� 鏃ュ織璁板綍缁撴潫
*/
return updateById(client);
}
@@ -224,12 +224,12 @@
throw new BusinessException("鍒犻櫎鐨勭敤鎴蜂笅鏈変笅绾х敤鎴凤紝涓嶅厑璁稿垹闄�");
}
/**
- * 鍒犻櫎鏅�氱敤鎴锋棩蹇楄褰曞紑濮�
+ * 鍒犻櫎鏅�氱敤鎴� 鏃ュ織璁板綍寮�濮�
*/
String content = "鍒犻櫎鏅�氱敤鎴凤細" + one.getClientName() + "鐢ㄦ埛id锛�" + id;
StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鏅�氱敤鎴�", content);
/**
- * 鍒犻櫎鏅�氱敤鎴锋棩蹇楄褰曠粨鏉�
+ * 鍒犻櫎鏅�氱敤鎴� 鏃ュ織璁板綍缁撴潫
*/
return removeById(id);
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 8b32e4c..c2a1ab6 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,6 +1,5 @@
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;
@@ -8,7 +7,6 @@
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;
@@ -18,7 +16,10 @@
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.*;
+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.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -28,7 +29,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @Author liuhaonan
@@ -315,7 +315,7 @@
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
}
/**
- * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍寮�濮�
*/
String content = "{浠诲姟ID锛�" + taskId
+ "锛屼换鍔″悕锛�" + taskName
@@ -324,7 +324,7 @@
+ " }";
StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟淇敼", content);
/**
- * IP闊虫煴浠诲姟淇敼鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍缁撴潫
*/
return result;
@@ -350,14 +350,14 @@
}
/**
- * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
String content = "{鍒犻櫎鐨勪换鍔D锛�" + taskId
+ "锛屼换鍔″垹闄ょ粨鏋滐細" + del
+ " }";
StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴浠诲姟鍒犻櫎", content);
/**
- * IP闊虫煴浠诲姟鍒犻櫎鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍缁撴潫
*/
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..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
@@ -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;
@@ -15,7 +14,6 @@
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;
@@ -23,7 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
@@ -61,11 +58,11 @@
}
});
/**
- * IP闊虫煴鍚屾鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍寮�濮�
*/
StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴鍚屾", "IP闊虫煴鍚屾璁惧");
/**
- * IP闊虫煴鍚屾鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍缁撴潫
*/
}
@@ -164,12 +161,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;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
index f53f39f..1882ddc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -95,12 +95,12 @@
}
/**
- * 鐔欐睕瀹氭椂鏇存敼
+ * 鐔欐睕瀹氭椂鏇存敼 鏃ュ織璁板綍寮�濮�
*/
String content = "{鐔欐睕瀹氭椂id锛�" + ledScheduleEntity.getId() + ",鐔欐睕瀹氭椂鍚嶇О锛�" + ledScheduleEntity.getName() + "鐔欐睕瀹氭椂鍐呭锛�" + JSON.toJSONString(ledScheduleEntity.getSchedule()) + " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂鏇存敼", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂浠诲姟鏇存敼", content);
/**
- * 鐔欐睕瀹氭椂鏇存敼
+ * 鐔欐睕瀹氭椂鏇存敼 鏃ュ織璁板綍缁撴潫
*/
return this.save(ledScheduleEntity);
}
@@ -132,7 +132,7 @@
}
/**
- * 鐔欐睕瀹氭椂鏂板
+ * 鐔欐睕瀹氭椂鎺ㄩ�� 鏃ュ織璁板綍寮�濮�
*/
String message = "";
List<String> listCode = new ArrayList<>();
@@ -143,9 +143,9 @@
message += "[灞忓箷Code:" + entity.getLightemitControlCode() + "灞忓箷鍚嶇О:" + entity.getLightemitName() + "],";
}
String content = "{鐔欐睕瀹氭椂id锛�" + ledScheduleEntity.getId() + ",鐔欐睕瀹氭椂鍚嶇О锛�" + ledScheduleEntity.getName() + "鐔欐睕灞忓箷淇℃伅锛�" + message + " }";
- StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕瀹氭椂鏇存敼", content);
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鎺ㄩ�佺啓姹涘畾鏃朵换鍔�", content);
/**
- * 鐔欐睕瀹氭椂鏂板
+ * 鐔欐睕瀹氭椂浠诲姟鎺ㄩ�� 鏃ュ織璁板綍缁撴潫
*/
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
index 2b57a7a..5e319a3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -245,7 +245,7 @@
+ "锛� 鑺傜洰鍚嶇О锛�" + byId.getName()
+ "}," + " 鎺ㄩ�佺粨鏋滐細" + result
+ " }";
- StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佸畾鏃朵换鍔�", content);
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佹挱鏀捐鍒�", content);
/**
* 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曠粨鏉�
*/
@@ -313,7 +313,7 @@
+ "锛� 鑺傜洰鍚嶇О锛�" + one.getName()
+ "}," + " 鎺ㄩ�佺粨鏋滐細" + result
+ " }";
- StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佸畾鏃朵换鍔�", content);
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佸畾鏃跺紑鍏冲睆", content);
/**
* 璇虹摝鎺ㄩ�佸畾鏃舵棩蹇楄褰曠粨鏉�
*/
--
Gitblit v1.9.3