zhanghua
2023-01-09 ad903cac22aaae30dc7367bd70f5a1aecf8c3f28
网格管理
4个文件已修改
48 ■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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) {
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")
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);
}
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);
    }
}