From ad903cac22aaae30dc7367bd70f5a1aecf8c3f28 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:12 +0800
Subject: [PATCH] 网格管理
---
ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java | 11 ++++++++++-
ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java | 3 +++
ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java | 18 +++++++++---------
ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java | 16 ++++++++++++++++
4 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
index d8be847..c34bc96 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
@@ -32,28 +32,28 @@
@GetMapping("/query")
@ApiOperation(value = "鏌ヨ缃戞牸")
- public CommonResult search(@RequestParam(required = false) String area,
- @RequestParam Integer size,
- @RequestParam Integer current) {
- return CommonResult.success(iOrgGridService.page(new Page<>(size, current), new LambdaQueryWrapper<OrgGrid>()
- .like(StringUtils.isNotBlank(area), OrgGrid::getArea, area)));
+ public CommonResult search(@RequestParam(required = false) String name,
+ @RequestParam Integer pageSize,
+ @RequestParam Integer currentPage) {
+ return CommonResult.success(iOrgGridService.search(pageSize, currentPage, name));
+
}
- @PostMapping("/addition")
+ @PostMapping("/add")
@ApiOperation(value = "娣诲姞")
@LogSave(operationType = "缃戞牸绠＄悊", contain = "娣诲姞")
public CommonResult add(@RequestBody OrgGrid orgGrid) {
return CommonResult.success(iOrgGridService.save(orgGrid));
}
- @DeleteMapping("/deletion")
+ @DeleteMapping("/delete/{id}")
@ApiOperation(value = "鍒犻櫎")
@LogSave(operationType = "缃戞牸绠＄悊", contain = "鍒犻櫎")
- public CommonResult delete(@RequestParam Integer id) {
+ public CommonResult delete(@PathVariable Long id) {
return CommonResult.success(iOrgGridService.removeById(id));
}
- @GetMapping("/modification")
+ @GetMapping("/update")
@ApiOperation(value = "淇敼")
@LogSave(operationType = "缃戞牸绠＄悊", contain = "淇敼")
public CommonResult modify(@RequestBody OrgGrid orgGrid) {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java
index f0af5ee..d6eacce 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java
@@ -29,7 +29,11 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
-
+ /**
+ * 鍖哄煙鍚嶇О
+ */
+ @TableField("name")
+ private String name;
/**
* 缃戞牸鍛樺鍚�
*/
@@ -49,6 +53,11 @@
private String area;
/**
+ * 鎻忚堪
+ */
+ @TableField("description")
+ private String description;
+ /**
* 鍖哄煙-鍧愭爣闆嗗悎
*/
@TableField("region")
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java
index 35c2465..b844db6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java
@@ -1,7 +1,9 @@
package com.ycl.service.equipment;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.equipment.OrgGrid;
+import com.ycl.vo.equipment.HandheldTerminalVo;
/**
* <p>
@@ -13,4 +15,5 @@
*/
public interface IOrgGridService extends IService<OrgGrid> {
+ IPage<OrgGrid> search(Integer pageSize, Integer current, String name);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
index 2379fb2..c056481 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
@@ -1,10 +1,17 @@
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.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.api.CommonResult;
+import com.ycl.entity.equipment.Loudspeaker;
import com.ycl.entity.equipment.OrgGrid;
import com.ycl.mapper.equipment.OrgGridMapper;
import com.ycl.service.equipment.IOrgGridService;
+import com.ycl.vo.equipment.HandheldTerminalVo;
import org.springframework.stereotype.Service;
/**
@@ -18,4 +25,13 @@
@Service
public class OrgGridServiceImpl extends ServiceImpl<OrgGridMapper, OrgGrid> implements IOrgGridService {
+ @Override
+ public IPage<OrgGrid> search(Integer pageSize, Integer currentPage, String name) {
+ Page<OrgGrid> page = new Page<>(currentPage, pageSize);
+ LambdaQueryWrapper<OrgGrid> queryWrapper = new LambdaQueryWrapper<OrgGrid>()
+ .like(StringUtils.isNotBlank(name), OrgGrid::getName, name)
+ .orderByDesc(OrgGrid::getId);
+
+ return baseMapper.selectPage(page, queryWrapper);
+ }
}
--
Gitblit v1.8.0