luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gis组管理，站点管理相关接口完成

Browse Source
This commit is contained in:
mi9688
2024-09-30 15:38:12 +08:00
parent 53097c8cf6
commit 237da90701
17 changed files with 378 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java
View File

@ -5,7 +5,8 @@ import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.page.TableDataInfo;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.ggroup.domain.GGroups;
import com.fastbee.ggroup.domain.dto.GGroupSite;
import com.fastbee.ggroup.domain.vo.GGroupSiteVo;
import com.fastbee.ggroup.enums.GroupTagEnum;
import com.fastbee.ggroup.service.IGGroupsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -14,7 +15,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.*;
import static java.util.stream.Collectors.toList;
/**
* 组Controller
@ -50,11 +53,32 @@ public class GGroupsController extends BaseController
public TableDataInfo listSite(GGroups gGroups)
{
super.startPage();
List<GGroupSite> list = gGroupsService.selectGGroupsListSites(gGroups);
List<GGroupSiteVo> list = gGroupsService.selectGGroupsListSites(gGroups);
list.forEach(System.err::println);
return super.getDataTable(list);
}
/**
* 获取组的标签(类别)
*/
@PreAuthorize("@ss.hasPermi('iot:groups:list')")
@GetMapping("/list-label")
@ApiOperation("获取组的标签(类别)")
public AjaxResult listLabel() {
// 使用传统的方式将枚举转换为列表
List<Map<String, Object>> labelList = new ArrayList<>();
for (GroupTagEnum tag : GroupTagEnum.values()) {
Map<String, Object> map = new HashMap<>();
map.put("code", tag.getCode());
map.put("value", tag.getDescription());
labelList.add(map);
}
return AjaxResult.success(labelList);
}
/**
* 导出组列表
*/

18
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitesController.java
View File

@ -3,6 +3,7 @@ package com.fastbee.data.controller.gis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.fastbee.ggroup.domain.dto.GGroupSiteDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -81,9 +82,9 @@ public class GSitesController extends BaseController
@PreAuthorize("@ss.hasPermi('ggroup:sites:add')")
@PostMapping
@ApiOperation("新增站点")
public AjaxResult add(@RequestBody GSites gSites)
public AjaxResult add(@RequestBody GGroupSiteDto gGroupSiteDto)
{
return toAjax(gSitesService.insertGSites(gSites));
return toAjax(gSitesService.insertGSites(gGroupSiteDto));
}
/**
@ -97,11 +98,22 @@ public class GSitesController extends BaseController
return toAjax(gSitesService.updateGSites(gSites));
}
/**
* 根据id删除站点
*/
@PreAuthorize("@ss.hasPermi('ggroup:sites:remove')")
@DeleteMapping("/{id}")
@ApiOperation("根据id删除站点")
public AjaxResult remove(@PathVariable Long id){
return toAjax(gSitesService.deleteGSitesById(id));
}
/**
* 删除站点
*/
@PreAuthorize("@ss.hasPermi('ggroup:sites:remove')")
@DeleteMapping("/{ids}")
@DeleteMapping("/batch/{ids}")
@ApiOperation("删除站点")
public AjaxResult remove(@PathVariable Long[] ids)
{