From 727a69f859060093e685582fa10e5de82dcc138a Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:37:49 +0800
Subject: [PATCH] 放假备份。完成集中控制器对接。
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InnerFrameDataService.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InnerFrameDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InnerFrameDataService.java
index 855c80d..a1897e2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InnerFrameDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InnerFrameDataService.java
@@ -1,10 +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.dao.domain.DeviceOperationLog;
import com.sandu.ximon.dao.domain.InnerFrameData;
import com.sandu.ximon.dao.mapper.InnerFrameDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author LHN
@@ -13,6 +20,31 @@
@Service
@AllArgsConstructor
public class InnerFrameDataService extends BaseServiceImpl<InnerFrameDataMapper, InnerFrameData> {
+ /**
+ * 鑾峰彇甯ф棩蹇楀垪琛�
+ *
+ * @param baseConditionVO
+ * @param deviceCode
+ * @param operation
+ * @return
+ */
+ public List<InnerFrameData> getLogList(BaseConditionVO baseConditionVO, String deviceCode, String operation) {
+
+ LambdaQueryWrapper<InnerFrameData> lambdaQueryWrapper = Wrappers.lambdaQuery(InnerFrameData.class);
+ if (deviceCode != null && deviceCode.trim().length() != 0) {
+ lambdaQueryWrapper.like(InnerFrameData::getDeviceCode, deviceCode);
+ }
+ if (operation != null && operation.trim().length() != 0) {
+ lambdaQueryWrapper.like(InnerFrameData::getOperation, operation);
+ }
+ lambdaQueryWrapper.orderByDesc(InnerFrameData::getId);
+
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ List<InnerFrameData> list = list(lambdaQueryWrapper);
+ return list;
+ }
/**
* 淇濆瓨鎿嶄綔甯ф暟鎹�
@@ -25,15 +57,22 @@
*/
public void storeInnerFrameData(String deviceCode, String operation, String syncType, String frame, String frameResult) {
- InnerFrameData innerFrameData = new InnerFrameData();
- innerFrameData.setDeviceCode(deviceCode);
- innerFrameData.setOperation(operation);
- innerFrameData.setSyncType(syncType);
- innerFrameData.setFrame(frame);
- innerFrameData.setFrameResult(frameResult);
+ try {
+ InnerFrameData innerFrameData = new InnerFrameData();
+ innerFrameData.setDeviceCode(deviceCode);
+ innerFrameData.setOperation(operation);
+ innerFrameData.setSyncType(syncType);
+ innerFrameData.setFrame(frame);
+ innerFrameData.setFrameResult(frameResult);
- save(innerFrameData);
+ save(innerFrameData);
+ } catch (Exception e) {
+ System.out.println("瀛樺偍鎿嶄綔甯уけ璐ワ紝鏁版嵁寮傚父");
+ }
}
+ public List<String> operationList() {
+ return baseMapper.operationList();
+ }
}
--
Gitblit v1.9.3