From 8870e3426c9f7280680b8cbc7dfdaf806ed43a45 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 01 十一月 2022 11:59:22 +0800
Subject: [PATCH] 音柱、单兵list查询
---
ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java | 9 +++++----
ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml | 2 +-
ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java | 10 ++++++++++
ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java | 3 ++-
ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java | 9 +++++----
ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java | 9 +++++----
ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java | 4 ++--
ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java | 2 ++
8 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
index 5c68bca..4c06cf2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java
@@ -1,6 +1,7 @@
package com.ycl.controller.epuipment;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
@@ -36,10 +37,10 @@
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@LogSave
- public CommonResult<Page<HandheldTerminalVo>> search(@RequestParam(required = false) Integer size,
- @RequestParam(required = false) Integer current,
- @RequestParam(required = false) Short state) {
- return CommonResult.success(handheldTerminalService.search(size, current, state));
+ public CommonResult<IPage<HandheldTerminalVo>> search(@RequestParam(required = true) Integer currentPage,
+ @RequestParam(required = true) Integer pageSize,
+ @RequestParam(required = false) Short state) {
+ return CommonResult.success(handheldTerminalService.search(pageSize, currentPage, state));
}
@PostMapping("/add")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
index 68b6cee..5283fc6 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
@@ -50,10 +51,10 @@
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@LogSave
- public CommonResult search(@RequestParam(required = false) Integer size,
- @RequestParam(required = false) Integer current,
- @RequestParam(required = false) Short state) {
- return null;
+ public CommonResult<IPage<Loudspeaker>> search(@RequestParam(required = true) Integer currentPage,
+ @RequestParam(required = true) Integer pageSize,
+ @RequestParam(required = false) Short state) {
+ return CommonResult.success(loudspeakerService.search(pageSize, currentPage, state));
}
@PostMapping("/add")
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java
index 996116f..a0a2cff 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java
@@ -1,6 +1,7 @@
package com.ycl.mapper.equipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.vo.equipment.HandheldTerminalVo;
import com.ycl.entity.equipment.HandheldTerminal;
@@ -16,5 +17,5 @@
*/
public interface HandheldTerminalMapper extends BaseMapper<HandheldTerminal> {
- Page<HandheldTerminalVo> search(Page<HandheldTerminalVo> page, @Param("state") Short state);
+ IPage<HandheldTerminalVo> search(IPage<HandheldTerminalVo> page, @Param("state") Short state);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java
index 5c05252..3eb8c2b 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java
@@ -1,6 +1,6 @@
package com.ycl.service.equipment;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.vo.equipment.HandheldTerminalVo;
import com.ycl.entity.equipment.HandheldTerminal;
@@ -14,5 +14,5 @@
* @since 2022-10-14
*/
public interface IHandheldTerminalService extends IService<HandheldTerminal> {
- Page<HandheldTerminalVo> search(Integer size, Integer current, Short state);
+ IPage<HandheldTerminalVo> search(Integer size, Integer current, Short state);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java
index c30eff8..ac91f5f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java
@@ -1,5 +1,6 @@
package com.ycl.service.equipment;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.entity.equipment.Loudspeaker;
@@ -13,4 +14,5 @@
* @since 2022-10-14
*/
public interface ILoudspeakerService extends IService<Loudspeaker> {
+ IPage<Loudspeaker> search(Integer pageSize, Integer currentPage, Short state);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java
index 3c9090c..01751da 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.equipment.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.vo.equipment.HandheldTerminalVo;
@@ -19,9 +20,9 @@
@Service
public class HandheldTerminalServiceImpl extends ServiceImpl<HandheldTerminalMapper, HandheldTerminal> implements IHandheldTerminalService {
@Override
- public Page<HandheldTerminalVo> search(Integer size, Integer current, Short state) {
- Page<HandheldTerminalVo> page = new Page<>(size, current);
- page = baseMapper.search(page, state);
- return page;
+ public IPage<HandheldTerminalVo> search(Integer size, Integer current, Short state) {
+ Page<HandheldTerminalVo> page = new Page<>(current, size);
+ IPage<HandheldTerminalVo> page1 = baseMapper.search(page, state);
+ return page1;
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java
index 015efdc..c361626 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java
@@ -1,9 +1,13 @@
package com.ycl.service.equipment.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.equipment.Loudspeaker;
import com.ycl.mapper.equipment.LoudspeakerMapper;
import com.ycl.service.equipment.ILoudspeakerService;
+import com.ycl.vo.equipment.HandheldTerminalVo;
import org.springframework.stereotype.Service;
/**
@@ -16,4 +20,10 @@
*/
@Service
public class LoudspeakerServiceImpl extends ServiceImpl<LoudspeakerMapper, Loudspeaker> implements ILoudspeakerService {
+ @Override
+ public IPage<Loudspeaker> search(Integer pageSize, Integer currentPage, Short state) {
+ Page<Loudspeaker> page = new Page<>(currentPage, pageSize);
+ LambdaQueryWrapper<Loudspeaker> queryWrapper = new LambdaQueryWrapper<Loudspeaker>().eq(state != null, Loudspeaker::getState, state);
+ return baseMapper.selectPage(page, queryWrapper);
+ }
}
diff --git a/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml
index a140cfb..6247fc7 100644
--- a/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml
@@ -32,7 +32,7 @@
LEFT JOIN ums_depart p on d.parent_id = p.id
<where>
<if test="state!=null">
- ht.state = #{carNum}
+ ht.state = #{state}
</if>
</where>
order by ht.id desc
--
Gitblit v1.8.0