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

河流，水库站点基本信息管理，bug修复等

Browse Source
This commit is contained in:
mi9688
2024-10-23 18:49:12 +08:00
parent 226370792b
commit 9912eb5671
35 changed files with 1235 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ import java.util.*;
@RestController
@RequestMapping("/gis/groups")
@Api(tags = "组")
@PreAuthorize("@ss.hasPermi('ggroup:groups')")
//@PreAuthorize("@ss.hasPermi('ggroup:groups')")
public class GGroupsController extends BaseController
{
private final IGGroupsService gGroupsService;

2
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java
View File

@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/gis/legend")
@Api(tags = "图例")
@PreAuthorize("@ss.hasPermi('ggroup:legend')")
//@PreAuthorize("@ss.hasPermi('ggroup:legend')")
public class GLegendController extends BaseController
{

32
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteInfoController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java
View File

@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.ggroup.domain.GSiteInfo;
import com.fastbee.ggroup.service.IGSiteInfoService;
import com.fastbee.ggroup.domain.GSiteMonitorInfo;
import com.fastbee.ggroup.service.IGSiteMonitorInfoService;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.common.core.page.TableDataInfo;
@ -28,15 +28,15 @@ import com.fastbee.common.core.page.TableDataInfo;
* @date 2024-10-10
*/
@RestController
@RequestMapping("/gis/site/info")
@PreAuthorize("@ss.hasPermi('ggroup:groups')")
@RequestMapping("/gis/site/monitor/info")
//@PreAuthorize("@ss.hasPermi('ggroup:groups')")
@Api(tags = "站点基础信息")
public class GSiteInfoController extends BaseController
public class GSiteMonitorInfoController extends BaseController
{
private final IGSiteInfoService gSiteInfoService;
private final IGSiteMonitorInfoService gSiteInfoService;
public GSiteInfoController(IGSiteInfoService gSiteInfoService) {
public GSiteMonitorInfoController(IGSiteMonitorInfoService gSiteInfoService) {
this.gSiteInfoService = gSiteInfoService;
}
@ -45,10 +45,10 @@ public class GSiteInfoController extends BaseController
*/
@GetMapping("/list")
@ApiOperation("查询站点基础信息列表")
public TableDataInfo list(GSiteInfo gSiteInfo)
public TableDataInfo list(GSiteMonitorInfo gSiteMonitorInfo)
{
startPage();
List<GSiteInfo> list = gSiteInfoService.selectGSiteInfoList(gSiteInfo);
List<GSiteMonitorInfo> list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo);
return getDataTable(list);
}
@ -57,10 +57,10 @@ public class GSiteInfoController extends BaseController
*/
@ApiOperation("导出站点基础信息列表")
@PostMapping("/export")
public void export(HttpServletResponse response, GSiteInfo gSiteInfo)
public void export(HttpServletResponse response, GSiteMonitorInfo gSiteMonitorInfo)
{
List<GSiteInfo> list = gSiteInfoService.selectGSiteInfoList(gSiteInfo);
ExcelUtil<GSiteInfo> util = new ExcelUtil<>(GSiteInfo.class);
List<GSiteMonitorInfo> list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo);
ExcelUtil<GSiteMonitorInfo> util = new ExcelUtil<>(GSiteMonitorInfo.class);
util.exportExcel(response, list, "站点基础信息数据");
}
@ -79,9 +79,9 @@ public class GSiteInfoController extends BaseController
*/
@PostMapping
@ApiOperation("新增站点基础信息")
public AjaxResult add(@RequestBody GSiteInfo gSiteInfo)
public AjaxResult add(@RequestBody GSiteMonitorInfo gSiteMonitorInfo)
{
return toAjax(gSiteInfoService.insertGSiteInfo(gSiteInfo));
return toAjax(gSiteInfoService.insertGSiteInfo(gSiteMonitorInfo));
}
/**
@ -89,9 +89,9 @@ public class GSiteInfoController extends BaseController
*/
@PutMapping
@ApiOperation("修改站点基础信息")
public AjaxResult edit(@RequestBody GSiteInfo gSiteInfo)
public AjaxResult edit(@RequestBody GSiteMonitorInfo gSiteMonitorInfo)
{
return toAjax(gSiteInfoService.updateGSiteInfo(gSiteInfo));
return toAjax(gSiteInfoService.updateGSiteInfo(gSiteMonitorInfo));
}
/**

110
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java Normal file
View File

@ -0,0 +1,110 @@
package com.fastbee.data.controller.gis;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.ggroup.domain.GSiteReservoirInfo;
import com.fastbee.ggroup.service.IGSiteReservoirInfoService;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.common.core.page.TableDataInfo;
/**
* 水库站点基础信息Controller
*
* @author kerwincui
* &#064;date 2024-10-23
*/
@RestController
@RequestMapping("/gis/site/reservoir/info")
@Api(tags = "水库站点基础信息")
public class GSiteReservoirInfoController extends BaseController
{
@Autowired
private IGSiteReservoirInfoService gSiteReservoirInfoService;
/**
* 查询水库站点基础信息列表
*/
@PreAuthorize("@ss.hasPermi('ggroup:info:list')")
@GetMapping("/list")
@ApiOperation("查询水库站点基础信息列表")
public TableDataInfo list(GSiteReservoirInfo gSiteReservoirInfo)
{
startPage();
List<GSiteReservoirInfo> list = gSiteReservoirInfoService.selectGSiteReservoirInfoList(gSiteReservoirInfo);
return getDataTable(list);
}
/**
* 导出水库站点基础信息列表
*/
@ApiOperation("导出水库站点基础信息列表")
@PreAuthorize("@ss.hasPermi('ggroup:info:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, GSiteReservoirInfo gSiteReservoirInfo)
{
List<GSiteReservoirInfo> list = gSiteReservoirInfoService.selectGSiteReservoirInfoList(gSiteReservoirInfo);
ExcelUtil<GSiteReservoirInfo> util = new ExcelUtil<GSiteReservoirInfo>(GSiteReservoirInfo.class);
util.exportExcel(response, list, "水库站点基础信息数据");
}
/**
* 获取根据站点id获取水库站点基础信息详细信息
*/
// @PreAuthorize("@ss.hasPermi('ggroup:info:query')")
@GetMapping(value = "/{siteId}")
@ApiOperation("获取水库站点基础信息详细信息")
public AjaxResult getInfo(@PathVariable("siteId") Long siteId)
{
return success(gSiteReservoirInfoService.selectGSiteReservoirInfoById(siteId));
}
/**
* 新增水库站点基础信息
*/
@PreAuthorize("@ss.hasPermi('ggroup:info:add')")
@PostMapping
@ApiOperation("新增水库站点基础信息")
public AjaxResult add(@RequestBody GSiteReservoirInfo gSiteReservoirInfo)
{
return toAjax(gSiteReservoirInfoService.insertGSiteReservoirInfo(gSiteReservoirInfo));
}
/**
* 修改水库站点基础信息
*/
@PreAuthorize("@ss.hasPermi('ggroup:info:edit')")
@PutMapping
@ApiOperation("修改水库站点基础信息")
public AjaxResult edit(@RequestBody GSiteReservoirInfo gSiteReservoirInfo)
{
return toAjax(gSiteReservoirInfoService.updateGSiteReservoirInfo(gSiteReservoirInfo));
}
/**
* 删除水库站点基础信息
*/
@PreAuthorize("@ss.hasPermi('ggroup:info:remove')")
@DeleteMapping("/{ids}")
@ApiOperation("删除水库站点基础信息")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(gSiteReservoirInfoService.deleteGSiteReservoirInfoByIds(ids));
}
}

38
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GRiverInfoController.java → fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java
View File

@ -15,12 +15,10 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.ggroup.domain.GRiverInfo;
import com.fastbee.ggroup.service.IGRiverInfoService;
import com.fastbee.ggroup.domain.GSiteRiverInfo;
import com.fastbee.ggroup.service.IGSiteRiverInfoService;
import com.fastbee.common.utils.poi.ExcelUtil;
import com.fastbee.common.core.page.TableDataInfo;
@ -31,12 +29,12 @@ import com.fastbee.common.core.page.TableDataInfo;
* @date 2024-10-22
*/
@RestController
@RequestMapping("/gis/river/info")
@RequestMapping("/gis/site/river/info")
@Api(tags = "河流基础信息")
public class GRiverInfoController extends BaseController
public class GSiteRiverInfoController extends BaseController
{
@Autowired
private IGRiverInfoService gRiverInfoService;
private IGSiteRiverInfoService gRiverInfoService;
/**
* 查询河流基础信息列表
@ -44,22 +42,22 @@ public class GRiverInfoController extends BaseController
@PreAuthorize("@ss.hasPermi('ggroup:info:list')")
@GetMapping("/list")
@ApiOperation("查询河流基础信息列表")
public TableDataInfo list(GRiverInfo gRiverInfo)
public TableDataInfo list(GSiteRiverInfo gSiteRiverInfo)
{
startPage();
List<GRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gRiverInfo);
List<GSiteRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo);
return getDataTable(list);
}
/**
* 根据站点id获取河流基本信息
*/
@PreAuthorize("@ss.hasPermi('ggroup:info:list')")
// @PreAuthorize("@ss.hasPermi('ggroup:info:list')")
@GetMapping("/byStationId/{stationId}")
@ApiOperation("根据站点id获取河流基本信息")
public AjaxResult listByStationId(@PathVariable("stationId") Long stationId){
GRiverInfo gRiverInfo = new GRiverInfo();
gRiverInfo.setSiteId(stationId);
List<GRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gRiverInfo);
GSiteRiverInfo gSiteRiverInfo = new GSiteRiverInfo();
gSiteRiverInfo.setSiteId(stationId);
List<GSiteRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo);
return success(!list.isEmpty()?list.get(0):null);
}
@ -69,10 +67,10 @@ public class GRiverInfoController extends BaseController
@ApiOperation("导出河流基础信息列表")
@PreAuthorize("@ss.hasPermi('ggroup:info:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, GRiverInfo gRiverInfo)
public void export(HttpServletResponse response, GSiteRiverInfo gSiteRiverInfo)
{
List<GRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gRiverInfo);
ExcelUtil<GRiverInfo> util = new ExcelUtil<GRiverInfo>(GRiverInfo.class);
List<GSiteRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo);
ExcelUtil<GSiteRiverInfo> util = new ExcelUtil<GSiteRiverInfo>(GSiteRiverInfo.class);
util.exportExcel(response, list, "河流基础信息数据");
}
@ -93,9 +91,9 @@ public class GRiverInfoController extends BaseController
@PreAuthorize("@ss.hasPermi('ggroup:info:add')")
@PostMapping
@ApiOperation("新增河流基础信息")
public AjaxResult add(@RequestBody GRiverInfo gRiverInfo)
public AjaxResult add(@RequestBody GSiteRiverInfo gSiteRiverInfo)
{
return toAjax(gRiverInfoService.insertGRiverInfo(gRiverInfo));
return toAjax(gRiverInfoService.insertGRiverInfo(gSiteRiverInfo));
}
/**
@ -104,9 +102,9 @@ public class GRiverInfoController extends BaseController
@PreAuthorize("@ss.hasPermi('ggroup:info:edit')")
@PutMapping
@ApiOperation("修改河流基础信息")
public AjaxResult edit(@RequestBody GRiverInfo gRiverInfo)
public AjaxResult edit(@RequestBody GSiteRiverInfo gSiteRiverInfo)
{
return toAjax(gRiverInfoService.updateGRiverInfo(gRiverInfo));
return toAjax(gRiverInfoService.updateGRiverInfo(gSiteRiverInfo));
}
/**

2
fastbee-open-api/src/main/java/com/fastbee/data/controller/project/ProjectController.java
View File

@ -126,7 +126,7 @@ public class ProjectController extends BaseController
@PreAuthorize("@ss.hasPermi('iot:project:remove')")
@DeleteMapping("/{projectIds}")
@ApiOperation("删除项目")
public AjaxResult remove(@PathVariable Long[] projectIds)
public AjaxResult remove(@PathVariable Long projectIds)
{
return toAjax(projectService.deleteProjectByProjectIds(projectIds));
}