From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java | 94 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java
index 80f5b88..54c2d93 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java
@@ -1,11 +1,17 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.DeviceOperationLog;
import com.sandu.ximon.dao.mapper.DeviceOperationLogMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author LHN
@@ -14,6 +20,34 @@
@Service
@AllArgsConstructor
public class DeviceOperationLogService extends BaseServiceImpl<DeviceOperationLogMapper, DeviceOperationLog> {
+
+ private final DeviceOperationLogMapper deviceOperationLogMapper;
+
+ /**
+ * 鑾峰彇鎿嶄綔鏃ュ織鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param poleCode
+ * @param operation
+ * @return
+ */
+ public List<DeviceOperationLog> getLogList(BaseConditionVO baseConditionVO, String poleCode, String operation) {
+
+ LambdaQueryWrapper<DeviceOperationLog> lambdaQueryWrapper = Wrappers.lambdaQuery(DeviceOperationLog.class);
+ if (poleCode != null && poleCode.trim().length() != 0) {
+ lambdaQueryWrapper.like(DeviceOperationLog::getPoleCode, poleCode);
+ }
+ if (operation != null && operation.trim().length() != 0) {
+ lambdaQueryWrapper.like(DeviceOperationLog::getOperation, operation);
+ }
+ lambdaQueryWrapper.orderByDesc(DeviceOperationLog::getId);
+
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ List<DeviceOperationLog> list = list(lambdaQueryWrapper);
+ return list;
+ }
/**
* 淇濆瓨璁惧鎿嶄綔鏃ュ織
@@ -25,20 +59,52 @@
* @param poleCode
*/
public void saveDeviceOperationLog(String deviceCode, String deviceName, String operation, String content, String poleCode) {
- DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
- deviceOperationLog.setUserId(SecurityUtils.getUserId());
- deviceOperationLog.setUserName(SecurityUtils.getUsername());
- if (deviceCode != null) {
- deviceOperationLog.setDeviceCode(deviceCode);
+ try {
+ DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
+ deviceOperationLog.setUserId(SecurityUtils.getUserId());
+ deviceOperationLog.setUserName(SecurityUtils.getUsername());
+ if (deviceCode != null && !"[]".equals(deviceCode)) {
+ deviceOperationLog.setDeviceCode(deviceCode);
+ }
+ if (deviceName != null) {
+ deviceOperationLog.setDeviceName(deviceName);
+ }
+ deviceOperationLog.setOperation(operation);
+ deviceOperationLog.setContent(content);
+ if (poleCode != null && !"[]".equals(poleCode)) {
+ deviceOperationLog.setPoleCode(poleCode);
+ }
+ this.save(deviceOperationLog);
+ } catch (Exception e) {
+ System.out.println("瀛樺偍鎿嶄綔甯уけ璐ワ紝鏁版嵁寮傚父");
}
- if (deviceName != null) {
- deviceOperationLog.setDeviceName(deviceName);
- }
- deviceOperationLog.setOperation(operation);
- deviceOperationLog.setContent(content);
- if (poleCode != null) {
- deviceOperationLog.setPoleCode(poleCode);
- }
- this.save(deviceOperationLog);
}
+
+ /**
+ * 鐧诲綍涓撳睘
+ *
+ * @param userId
+ * @param UserName
+ * @param operation
+ * @param content
+ */
+ public void storeOperationLoginData(Long userId, String UserName, String operation, String content) {
+ try {
+ DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
+ deviceOperationLog.setUserId(userId);
+ deviceOperationLog.setUserName(UserName);
+ deviceOperationLog.setOperation(operation);
+ deviceOperationLog.setContent(content);
+ this.save(deviceOperationLog);
+ } catch (Exception e) {
+ System.out.println("瀛樺偍鎿嶄綔甯уけ璐ワ紝鏁版嵁寮傚父");
+ }
+ }
+
+ public List<String> operationList(){
+ List<String> operationList= deviceOperationLogMapper.operationList();
+ return operationList;
+ }
+
+
}
--
Gitblit v1.9.3