From 04f425c6d56dcc370156daa3cc6e79b7234a1b3d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 六月 2025 16:19:19 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/AlarmInspectionResultService.java | 18 +++++++++++++++++-
src/main/java/com/whyc/pojo/web_site/AlarmInspectionResult.java | 2 +-
src/main/java/com/whyc/controller/AlarmInspectionResultController.java | 30 ++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlarmInspectionResultController.java b/src/main/java/com/whyc/controller/AlarmInspectionResultController.java
new file mode 100644
index 0000000..478bd19
--- /dev/null
+++ b/src/main/java/com/whyc/controller/AlarmInspectionResultController.java
@@ -0,0 +1,30 @@
+package com.whyc.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Response;
+import com.whyc.pojo.web_site.AlarmInspectionResult;
+import com.whyc.service.AlarmInspectionResultService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("alarmInspectionResult")
+@Api(tags = "鍛婅宸℃鍘嗗彶琛�")
+public class AlarmInspectionResultController {
+
+ @Autowired
+ private AlarmInspectionResultService service;
+
+ @ApiOperation("鏌ヨ鍒嗛〉")
+ @GetMapping("getPage")
+ public Response<PageInfo<AlarmInspectionResult>> getPage(@RequestParam Integer pageNum,@RequestParam Integer pageSize,
+ @RequestParam(required = false) Integer stationId,@RequestParam(required = false) Integer inspectionType) {
+ return service.getPage(pageNum, pageSize,stationId,inspectionType);
+ }
+
+}
diff --git a/src/main/java/com/whyc/pojo/web_site/AlarmInspectionResult.java b/src/main/java/com/whyc/pojo/web_site/AlarmInspectionResult.java
index 187cad4..28e9a1b 100644
--- a/src/main/java/com/whyc/pojo/web_site/AlarmInspectionResult.java
+++ b/src/main/java/com/whyc/pojo/web_site/AlarmInspectionResult.java
@@ -11,7 +11,7 @@
@ToString
@Data
-@TableName(schema = "web_site",value ="tb_alarm_inspection")
+@TableName(schema = "web_site",value ="tb_alarm_inspection_result")
@ApiModel("鍛婅宸℃瀹炴椂琛�")
public class AlarmInspectionResult {
diff --git a/src/main/java/com/whyc/service/AlarmInspectionResultService.java b/src/main/java/com/whyc/service/AlarmInspectionResultService.java
index d17dd32..8221da1 100644
--- a/src/main/java/com/whyc/service/AlarmInspectionResultService.java
+++ b/src/main/java/com/whyc/service/AlarmInspectionResultService.java
@@ -1,11 +1,16 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Response;
import com.whyc.mapper.AlarmInspectionResultMapper;
import com.whyc.pojo.web_site.AlarmInspectionResult;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
@Service
public class AlarmInspectionResultService {
@@ -16,4 +21,15 @@
public void add(AlarmInspectionResult result) {
mapper.insert(result);
}
+
+ public Response<PageInfo<AlarmInspectionResult>> getPage(Integer pageNum, Integer pageSize, Integer stationId, Integer inspectionType) {
+ PageHelper.startPage(pageNum, pageSize);
+ QueryWrapper<AlarmInspectionResult> query = Wrappers.query();
+ query.eq(stationId != null,"station_id", stationId);
+ query.eq(inspectionType != null,"inspection_type", inspectionType);
+ query.orderByDesc("id");
+ List<AlarmInspectionResult> list = mapper.selectList(query);
+ PageInfo<AlarmInspectionResult> pageInfo = new PageInfo<>(list);
+ return new Response<PageInfo<AlarmInspectionResult>>().set(1, pageInfo);
+ }
}
--
Gitblit v1.9.1