diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/json/JsonStrUtil.java b/fastbee-common/src/main/java/com/fastbee/common/utils/json/JsonStrUtil.java index e3a7a1f..f1e1b0c 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/json/JsonStrUtil.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/json/JsonStrUtil.java @@ -1,5 +1,6 @@ package com.fastbee.common.utils.json; +import cn.hutool.json.JSONException; import cn.hutool.json.JSONUtil; import org.apache.commons.lang3.StringUtils; @@ -30,4 +31,16 @@ public class JsonStrUtil { return true; } + /** + * 验证字符串是否是json格式 + */ + public static boolean isValidJson(String jsonStr) { + try { + JSONUtil.parseObj(jsonStr); + } catch (JSONException e) { + return false; + } + return true; + } + } diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/validate/LongitudeLatitudeValidateUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/validate/LongitudeLatitudeValidateUtils.java new file mode 100644 index 0000000..b9aa1e0 --- /dev/null +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/validate/LongitudeLatitudeValidateUtils.java @@ -0,0 +1,36 @@ +package com.fastbee.common.utils.validate; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class LongitudeLatitudeValidateUtils { + + /** + * 判断字符串是不是经度或者纬度 + * @param str 经纬度字符串 + * @return true 或 false + */ + public static boolean isLongitudeOrLatitude(String str) { + String regex = "^[-+]?\\d{1,3}(\\.\\d+)?$"; // 正则表达式，匹配经度或纬度格式 + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(str); + + // 如果字符串匹配正则表达式且值的范围在经纬度范围内，则返回 true + return matcher.matches() && isValueInRange(str); + } + + /** + * 判断值是否在经纬度范围内 + * @param str 经纬度字符串表示的值 + * @return true 如果值在范围内，false 否则 + */ + public static boolean isValueInRange(String str) { + try { + double value = Double.parseDouble(str); + return value >= -180 && value <= 180; // 经度范围 + } catch (NumberFormatException e) { + // 字符串无法转换为数字，认为不在范围内 + return false; + } + } +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java index f1d7467..c6ad40a 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java @@ -1,28 +1,20 @@ 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.GSiteIrrigateInfo; import com.fastbee.ggroup.service.IGSiteIrrigateInfoService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; + /** * 灌区基础信息Controller @@ -38,31 +30,6 @@ public class GSiteIrrigateInfoController extends BaseController @Autowired private IGSiteIrrigateInfoService gSiteIrrigateInfoService; -/** - * 查询灌区基础信息列表 - */ -//@PreAuthorize("@ss.hasPermi('ggroup:info:list')") -@GetMapping("/list") -@ApiOperation("查询灌区基础信息列表") - public TableDataInfo list(GSiteIrrigateInfo gSiteIrrigateInfo) - { - startPage(); - List list = gSiteIrrigateInfoService.selectGSiteIrrigateInfoList(gSiteIrrigateInfo); - return getDataTable(list); - } - - /** - * 导出灌区基础信息列表 - */ - @ApiOperation("导出灌区基础信息列表") -// @PreAuthorize("@ss.hasPermi('ggroup:info:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, GSiteIrrigateInfo gSiteIrrigateInfo) - { - List list = gSiteIrrigateInfoService.selectGSiteIrrigateInfoList(gSiteIrrigateInfo); - ExcelUtil util = new ExcelUtil(GSiteIrrigateInfo.class); - util.exportExcel(response, list, "灌区基础信息数据"); - } /** * 获取灌区基础信息详细信息 @@ -72,20 +39,8 @@ public class GSiteIrrigateInfoController extends BaseController @ApiOperation("获取灌区基础信息详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(gSiteIrrigateInfoService.selectGSiteIrrigateInfoBySiteId(id)); + return AjaxResult.success(gSiteIrrigateInfoService.selectGSiteIrrigateInfoBySiteId(id)); } - - /** - * 新增灌区基础信息 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:add')") - @PostMapping - @ApiOperation("新增灌区基础信息") - public AjaxResult add(@RequestBody GSiteIrrigateInfo gSiteIrrigateInfo) - { - return toAjax(gSiteIrrigateInfoService.insertGSiteIrrigateInfo(gSiteIrrigateInfo)); - } - /** * 修改灌区基础信息 */ @@ -97,14 +52,4 @@ public class GSiteIrrigateInfoController extends BaseController return toAjax(gSiteIrrigateInfoService.updateGSiteIrrigateInfo(gSiteIrrigateInfo)); } - /** - * 删除灌区基础信息 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除灌区基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(gSiteIrrigateInfoService.deleteGSiteIrrigateInfoByIds(ids)); - } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java index 31dc7e9..c12e266 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java @@ -40,29 +40,6 @@ public class GSiteMonitorInfoController extends BaseController this.gSiteInfoService = gSiteInfoService; } - /** - * 查询站点基础信息列表 - */ - @GetMapping("/list") - @ApiOperation("查询站点基础信息列表") - public TableDataInfo list(GSiteMonitorInfo gSiteMonitorInfo) - { - startPage(); - List list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo); - return getDataTable(list); - } - - /** - * 导出站点基础信息列表 - */ - @ApiOperation("导出站点基础信息列表") - @PostMapping("/export") - public void export(HttpServletResponse response, GSiteMonitorInfo gSiteMonitorInfo) - { - List list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo); - ExcelUtil util = new ExcelUtil<>(GSiteMonitorInfo.class); - util.exportExcel(response, list, "站点基础信息数据"); - } /** * 获取站点基础信息详细信息 @@ -74,16 +51,6 @@ public class GSiteMonitorInfoController extends BaseController return AjaxResult.success(gSiteInfoService.selectGSiteInfoById(siteId)); } - /** - * 新增站点基础信息 - */ - @PostMapping - @ApiOperation("新增站点基础信息") - public AjaxResult add(@RequestBody GSiteMonitorInfo gSiteMonitorInfo) - { - return toAjax(gSiteInfoService.insertGSiteInfo(gSiteMonitorInfo)); - } - /** * 修改站点基础信息 */ @@ -94,13 +61,4 @@ public class GSiteMonitorInfoController extends BaseController return toAjax(gSiteInfoService.updateGSiteInfo(gSiteMonitorInfo)); } - /** - * 删除站点基础信息 - */ - @DeleteMapping("/{ids}") - @ApiOperation("删除站点基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(gSiteInfoService.deleteGSiteInfoByIds(ids)); - } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java index 25fe8d6..32df114 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java @@ -38,31 +38,6 @@ public class GSitePumpInfoController extends BaseController @Autowired private IGSitePumpInfoService gSitePumpInfoService; -/** - * 查询泵站信息列表 - */ -//@PreAuthorize("@ss.hasPermi('ggroup:info:list')") -@GetMapping("/list") -@ApiOperation("查询泵站信息列表") - public TableDataInfo list(GSitePumpInfo gSitePumpInfo) - { - startPage(); - List list = gSitePumpInfoService.selectGSitePumpInfoList(gSitePumpInfo); - return getDataTable(list); - } - - /** - * 导出泵站信息列表 - */ - @ApiOperation("导出泵站信息列表") - @PreAuthorize("@ss.hasPermi('ggroup:info:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, GSitePumpInfo gSitePumpInfo) - { - List list = gSitePumpInfoService.selectGSitePumpInfoList(gSitePumpInfo); - ExcelUtil util = new ExcelUtil(GSitePumpInfo.class); - util.exportExcel(response, list, "泵站信息数据"); - } /** * 获取泵站信息详细信息 @@ -72,18 +47,7 @@ public class GSitePumpInfoController extends BaseController @ApiOperation("获取泵站信息详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(gSitePumpInfoService.selectGSitePumpInfoBySiteId(id)); - } - - /** - * 新增泵站信息 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:add')") - @PostMapping - @ApiOperation("新增泵站信息") - public AjaxResult add(@RequestBody GSitePumpInfo gSitePumpInfo) - { - return toAjax(gSitePumpInfoService.insertGSitePumpInfo(gSitePumpInfo)); + return AjaxResult.success(gSitePumpInfoService.selectGSitePumpInfoBySiteId(id)); } /** @@ -97,14 +61,4 @@ public class GSitePumpInfoController extends BaseController return toAjax(gSitePumpInfoService.updateGSiteSluiceInfo(gSitePumpInfo)); } - /** - * 删除泵站信息 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除泵站信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(gSitePumpInfoService.deleteGSitePumpInfoByIds(ids)); - } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java index e3d5ab3..20d9e89 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java @@ -38,32 +38,6 @@ 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 list = gSiteReservoirInfoService.selectGSiteReservoirInfoList(gSiteReservoirInfo); - return getDataTable(list); - } - - /** - * 导出水库站点基础信息列表 - */ - @ApiOperation("导出水库站点基础信息列表") -// @PreAuthorize("@ss.hasPermi('ggroup:info:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, GSiteReservoirInfo gSiteReservoirInfo) - { - List list = gSiteReservoirInfoService.selectGSiteReservoirInfoList(gSiteReservoirInfo); - ExcelUtil util = new ExcelUtil(GSiteReservoirInfo.class); - util.exportExcel(response, list, "水库站点基础信息数据"); - } - /** * 获取根据站点id获取水库站点基础信息详细信息 */ @@ -72,18 +46,7 @@ public class GSiteReservoirInfoController extends BaseController @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)); + return AjaxResult.success(gSiteReservoirInfoService.selectGSiteReservoirInfoBySiteId(siteId)); } /** @@ -96,15 +59,4 @@ public class GSiteReservoirInfoController extends BaseController { 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)); - } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java index 36c10e7..91c10f6 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java @@ -36,65 +36,18 @@ public class GSiteRiverInfoController extends BaseController @Autowired private IGSiteRiverInfoService gRiverInfoService; - /** - * 查询河流基础信息列表 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:list')") - @GetMapping("/list") - @ApiOperation("查询河流基础信息列表") - public TableDataInfo list(GSiteRiverInfo gSiteRiverInfo) - { - startPage(); - List list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo); - return getDataTable(list); - } + /** * 根据站点id获取河流基本信息 */ // @PreAuthorize("@ss.hasPermi('ggroup:info:list')") @GetMapping("/byStationId/{stationId}") @ApiOperation("根据站点id获取河流基本信息") - public AjaxResult listByStationId(@PathVariable("stationId") Long stationId){ - GSiteRiverInfo gSiteRiverInfo = new GSiteRiverInfo(); - gSiteRiverInfo.setSiteId(stationId); - List list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo); - return success(!list.isEmpty()?list.get(0):null); + public AjaxResult listByStationId(@PathVariable("stationId") Long siteId){ + + return AjaxResult.success(gRiverInfoService.selectGRiverInfoBySiteId(siteId)); } - /** - * 导出河流基础信息列表 - */ - @ApiOperation("导出河流基础信息列表") - @PreAuthorize("@ss.hasPermi('ggroup:info:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, GSiteRiverInfo gSiteRiverInfo) - { - List list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo); - ExcelUtil util = new ExcelUtil(GSiteRiverInfo.class); - util.exportExcel(response, list, "河流基础信息数据"); - } - - /** - * 河流基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('ggroup:info:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取河流基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(gRiverInfoService.selectGRiverInfoById(id)); - } - - /** - * 新增河流基础信息 - */ - @PreAuthorize("@ss.hasPermi('ggroup:info:add')") - @PostMapping - @ApiOperation("新增河流基础信息") - public AjaxResult add(@RequestBody GSiteRiverInfo gSiteRiverInfo) - { - return toAjax(gRiverInfoService.insertGRiverInfo(gSiteRiverInfo)); - } /** * 修改河流基础信息 @@ -107,14 +60,5 @@ public class GSiteRiverInfoController extends BaseController return toAjax(gRiverInfoService.updateGRiverInfo(gSiteRiverInfo)); } - /** - * 删除河流基础信息 - */ - @PreAuthorize("@ss.hasPermi('ggroup:info:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除河流基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(gRiverInfoService.deleteGRiverInfoByIds(ids)); - } + } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java index a895a1c..704028e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java @@ -38,60 +38,18 @@ public class GSiteSluiceInfoController extends BaseController @Autowired private IGSiteSluiceInfoService gSiteSluiceInfoService; -/** - * 查询水闸基本信息列表 - */ -//@PreAuthorize("@ss.hasPermi('ggroup:info:list')") -@GetMapping("/list") -@ApiOperation("查询水闸基本信息列表") - public TableDataInfo list(GSiteSluiceInfo gSiteSluiceInfo) - { - startPage(); - List list = gSiteSluiceInfoService.selectGSiteSluiceInfoList(gSiteSluiceInfo); - return getDataTable(list); - } - - /** - * 导出水闸基本信息列表 - */ - @ApiOperation("导出水闸基本信息列表") -// @PreAuthorize("@ss.hasPermi('ggroup:info:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, GSiteSluiceInfo gSiteSluiceInfo) - { - List list = gSiteSluiceInfoService.selectGSiteSluiceInfoList(gSiteSluiceInfo); - ExcelUtil util = new ExcelUtil(GSiteSluiceInfo.class); - util.exportExcel(response, list, "水闸基本信息数据"); - } /** * 获取水闸基本信息详细信息 - * - @PreAuthorize("@ss.hasPermi('ggroup:info:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取水闸基本信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(gSiteSluiceInfoService.selectGSiteSluiceInfoById(id)); - }*/ + */ // @PreAuthorize("@ss.hasPermi('ggroup:info:siteId')") @GetMapping(value = "/{siteId}") @ApiOperation("获取水闸基本信息详细信息") public AjaxResult getsiteIdInfo(@PathVariable("siteId") Long siteId) { - return success(gSiteSluiceInfoService.selectGSiteSluiceInfoBySiteId(siteId)); + return AjaxResult.success(gSiteSluiceInfoService.selectGSiteSluiceInfoBySiteId(siteId)); } - /** - * 新增水闸基本信息 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:add')") - @PostMapping - @ApiOperation("新增水闸基本信息") - public AjaxResult add(@RequestBody GSiteSluiceInfo gSiteSluiceInfo) - { - return toAjax(gSiteSluiceInfoService.insertGSiteSluiceInfo(gSiteSluiceInfo)); - } /** * 修改水闸基本信息 @@ -104,19 +62,7 @@ public class GSiteSluiceInfoController extends BaseController return toAjax(gSiteSluiceInfoService.updateGSiteSluiceInfo(gSiteSluiceInfo)); } - /** - * 删除水闸基本信息 - */ -// @PreAuthorize("@ss.hasPermi('ggroup:info:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除水闸基本信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(gSiteSluiceInfoService.deleteGSiteSluiceInfoByIds(ids)); - } - /** - * 更新水库的基本信息 - */ + } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java index b36b27f..6faaa55 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java @@ -81,4 +81,7 @@ public class GSites extends BaseEntity { @Excel(name = "完整行政区划代码一般为[县code,镇code,村code]") @ApiModelProperty("完整行政区划代码一般为[县code,镇code,村code]") private String fullAreaCode; + + /** 删除状态[0存在,2删除] */ + private Long delFlag; } \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java index ab1404e..67237a3 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java @@ -1,6 +1,8 @@ package com.fastbee.ggroup.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.ggroup.domain.GSiteIrrigateInfo; import org.apache.ibatis.annotations.Mapper; @@ -11,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @date 2024-11-04 */ @Mapper -public interface GSiteIrrigateInfoMapper +public interface GSiteIrrigateInfoMapper extends BaseMapper { /** * 查询灌区基础信息 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java index ea1c753..4500ed8 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java @@ -1,6 +1,8 @@ package com.fastbee.ggroup.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.ggroup.domain.GSiteReservoirInfo; import org.apache.ibatis.annotations.Mapper; @@ -11,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @date 2024-10-23 */ @Mapper -public interface GSiteReservoirInfoMapper +public interface GSiteReservoirInfoMapper extends BaseMapper { /** * 查询水库站点基础信息 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java index 15d4127..7fe2c00 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java @@ -28,7 +28,7 @@ public interface GSiteSluiceInfoMapper extends BaseMapper * @param siteId 水闸基本信息主键 * @return 水闸基本信息 */ - public List selectGSiteSluiceInfoBySiteId(Long siteId); + public GSiteSluiceInfo selectGSiteSluiceInfoBySiteId(Long siteId); /** * 查询水闸基本信息列表 * diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java index eb49015..c1dd564 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java @@ -25,37 +25,6 @@ public interface IGSiteIrrigateInfoService * @return 结果 */ public int updateGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo); - /** - * 查询灌区基础信息列表 - * - * @param gSiteIrrigateInfo 灌区基础信息 - * @return 灌区基础信息集合 - */ - public List selectGSiteIrrigateInfoList(GSiteIrrigateInfo gSiteIrrigateInfo); - - /** - * 新增灌区基础信息 - * - * @param gSiteIrrigateInfo 灌区基础信息 - * @return 结果 - */ - public int insertGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo); - - /** - * 批量删除灌区基础信息 - * - * @param ids 需要删除的灌区基础信息主键集合 - * @return 结果 - */ - public int deleteGSiteIrrigateInfoByIds(Long[] ids); - - /** - * 删除灌区基础信息信息 - * - * @param id 灌区基础信息主键 - * @return 结果 - */ - public int deleteGSiteIrrigateInfoById(Long id); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java index 8edc58b..18c3735 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java @@ -19,21 +19,7 @@ public interface IGSiteMonitorInfoService */ GSiteMonitorInfo selectGSiteInfoById(Long id); - /** - * 查询站点基础信息列表 - * - * @param gSiteMonitorInfo 站点基础信息 - * @return 站点基础信息集合 - */ - List selectGSiteInfoList(GSiteMonitorInfo gSiteMonitorInfo); - /** - * 新增站点基础信息 - * - * @param gSiteMonitorInfo 站点基础信息 - * @return 结果 - */ - int insertGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo); /** * 修改站点基础信息 @@ -43,12 +29,6 @@ public interface IGSiteMonitorInfoService */ int updateGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo); - /** - * 批量删除站点基础信息 - * - * @param ids 需要删除的站点基础信息主键集合 - * @return 结果 - */ - int deleteGSiteInfoByIds(Long[] ids); + } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java index 4cbd078..6e317cd 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java @@ -19,22 +19,6 @@ public interface IGSitePumpInfoService */ public GSitePumpInfo selectGSitePumpInfoBySiteId(Long SiteId); - /** - * 查询泵站信息列表 - * - * @param gSitePumpInfo 泵站信息 - * @return 泵站信息集合 - */ - public List selectGSitePumpInfoList(GSitePumpInfo gSitePumpInfo); - - /** - * 新增泵站信息 - * - * @param gSitePumpInfo 泵站信息 - * @return 结果 - */ - public int insertGSitePumpInfo(GSitePumpInfo gSitePumpInfo); - /** * 修改泵站信息 * @@ -43,19 +27,4 @@ public interface IGSitePumpInfoService */ public int updateGSiteSluiceInfo(GSitePumpInfo gSitePumpInfo); - /** - * 批量删除泵站信息 - * - * @param ids 需要删除的泵站信息主键集合 - * @return 结果 - */ - public int deleteGSitePumpInfoByIds(Long[] ids); - - /** - * 删除泵站信息信息 - * - * @param id 泵站信息主键 - * @return 结果 - */ - public int deleteGSitePumpInfoById(Long id); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java index b6682cd..803d0d0 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java @@ -7,17 +7,10 @@ import com.fastbee.ggroup.domain.GSiteReservoirInfo; * 水库站点基础信息Service接口 * * @author kerwincui - * @date 2024-10-23 + * @date 2024-10-23 */ public interface IGSiteReservoirInfoService { - /** - * 查询水库站点基础信息 - * - * @param id 水库站点基础信息主键 - * @return 水库站点基础信息 - */ - public GSiteReservoirInfo selectGSiteReservoirInfoById(Long id); /** * 根据站点的id查询水闸的站点信息 @@ -25,22 +18,7 @@ public interface IGSiteReservoirInfoService * @return 水闸站点的信息 */ - public List selectGSiteReservoirInfoBySiteId(Long siteId); - /** - * 查询水库站点基础信息列表 - * - * @param gSiteReservoirInfo 水库站点基础信息 - * @return 水库站点基础信息集合 - */ - public List selectGSiteReservoirInfoList(GSiteReservoirInfo gSiteReservoirInfo); - - /** - * 新增水库站点基础信息 - * - * @param gSiteReservoirInfo 水库站点基础信息 - * @return 结果 - */ - public int insertGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo); + public GSiteReservoirInfo selectGSiteReservoirInfoBySiteId(Long siteId); /** * 修改水库站点基础信息 @@ -50,19 +28,5 @@ public interface IGSiteReservoirInfoService */ public int updateGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo); - /** - * 批量删除水库站点基础信息 - * - * @param ids 需要删除的水库站点基础信息主键集合 - * @return 结果 - */ - public int deleteGSiteReservoirInfoByIds(Long[] ids); - /** - * 删除水库站点基础信息信息 - * - * @param id 水库站点基础信息主键 - * @return 结果 - */ - public int deleteGSiteReservoirInfoById(Long id); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java index a2ad313..e64cefd 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java @@ -13,27 +13,13 @@ public interface IGSiteRiverInfoService { /** * 查询河流基础信息 - * - * @param id 河流基础信息主键 + * + * @param siteId 站点id * @return 河流基础信息 */ - public GSiteRiverInfo selectGRiverInfoById(Long id); + public GSiteRiverInfo selectGRiverInfoBySiteId(Long siteId); - /** - * 查询河流基础信息列表 - * - * @param gSiteRiverInfo 河流基础信息 - * @return 河流基础信息集合 - */ - public List selectGRiverInfoList(GSiteRiverInfo gSiteRiverInfo); - /** - * 新增河流基础信息 - * - * @param gSiteRiverInfo 河流基础信息 - * @return 结果 - */ - public int insertGRiverInfo(GSiteRiverInfo gSiteRiverInfo); /** * 修改河流基础信息 @@ -43,19 +29,5 @@ public interface IGSiteRiverInfoService */ public int updateGRiverInfo(GSiteRiverInfo gSiteRiverInfo); - /** - * 批量删除河流基础信息 - * - * @param ids 需要删除的河流基础信息主键集合 - * @return 结果 - */ - public int deleteGRiverInfoByIds(Long[] ids); - /** - * 删除河流基础信息信息 - * - * @param id 河流基础信息主键 - * @return 结果 - */ - public int deleteGRiverInfoById(Long id); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java index 3e0f648..a91af0f 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java @@ -13,56 +13,20 @@ import com.fastbee.ggroup.domain.GSiteSluiceInfo; */ public interface IGSiteSluiceInfoService { - /** - * 查询水闸基本信息 - * - * @param id 水闸基本信息主键 - * @return 水闸基本信息 - */ - public GSiteSluiceInfo selectGSiteSluiceInfoById(Long id); + /** * 根据siteId查询水闸基本信息 * * @param siteId 水闸基本信息外键 * @return 水闸基本信息 */ - public List selectGSiteSluiceInfoBySiteId(Long siteId); - /** - * 查询水闸基本信息列表 - * - * @param gSiteSluiceInfo 水闸基本信息 - * @return 水闸基本信息集合 - */ - public List selectGSiteSluiceInfoList(GSiteSluiceInfo gSiteSluiceInfo); + public GSiteSluiceInfo selectGSiteSluiceInfoBySiteId(Long siteId); - /** - * 新增水闸基本信息 - * - * @param gSiteSluiceInfo 水闸基本信息 - * @return 结果 - */ - public int insertGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo); - - /** - * 批量删除水闸基本信息 - * - * @param ids 需要删除的水闸基本信息主键集合 - * @return 结果 - */ - public int deleteGSiteSluiceInfoByIds(Long[] ids); - - /** - * 删除水闸基本信息信息 - * - * @param id 水闸基本信息主键 - * @return 结果 - */ - public int deleteGSiteSluiceInfoById(Long id); /** * * @param gSiteSluiceInfo 修改水闸的基本信息 - * @return + * @return 水闸的基本信息 */ public int updateGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java index 13df561..4524e16 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java @@ -51,59 +51,9 @@ public class GSiteIrrigateInfoServiceImpl implements IGSiteIrrigateInfoService if(Objects.isNull(gSiteIrrigateInfoMapper.selectGSiteIrrigateInfoBySiteId(gSiteIrrigateInfo.getSiteId()))){ //没有该条数据则新增 gSiteIrrigateInfo.setCreateTime(DateUtils.getNowDate()); - return insertGSiteIrrigateInfo(gSiteIrrigateInfo); + return gSiteIrrigateInfoMapper.insert(gSiteIrrigateInfo); } gSiteIrrigateInfo.setUpdateTime(DateUtils.getNowDate()); return gSiteIrrigateInfoMapper.updateGSiteIrrigateInfo(gSiteIrrigateInfo); } - /** - * 查询灌区基础信息列表 - * - * @param gSiteIrrigateInfo 灌区基础信息 - * @return 灌区基础信息 - */ - @Override - public List selectGSiteIrrigateInfoList(GSiteIrrigateInfo gSiteIrrigateInfo) - { - return gSiteIrrigateInfoMapper.selectGSiteIrrigateInfoList(gSiteIrrigateInfo); - } - - /** - * 新增灌区基础信息 - * - * @param gSiteIrrigateInfo 灌区基础信息 - * @return 结果 - */ - @Override - public int insertGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo) - { - gSiteIrrigateInfo.setCreateTime(DateUtils.getNowDate()); - return gSiteIrrigateInfoMapper.insertGSiteIrrigateInfo(gSiteIrrigateInfo); - } - - - - /** - * 批量删除灌区基础信息 - * - * @param ids 需要删除的灌区基础信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteIrrigateInfoByIds(Long[] ids) - { - return gSiteIrrigateInfoMapper.deleteGSiteIrrigateInfoByIds(ids); - } - - /** - * 删除灌区基础信息信息 - * - * @param id 灌区基础信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteIrrigateInfoById(Long id) - { - return gSiteIrrigateInfoMapper.deleteGSiteIrrigateInfoById(id); - } } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java index 0fc51db..3d09e57 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java @@ -40,30 +40,9 @@ public class GSiteMonitorInfoServiceImpl implements IGSiteMonitorInfoService return gSiteMonitorInfoMapper.selectGSiteInfoBySiteId(id); } - /** - * 查询站点基础信息列表 - * - * @param gSiteMonitorInfo 站点基础信息 - * @return 站点基础信息 - */ - @Override - public List selectGSiteInfoList(GSiteMonitorInfo gSiteMonitorInfo) - { - return gSiteMonitorInfoMapper.selectGSiteInfoList(gSiteMonitorInfo); - } - /** - * 新增站点基础信息 - * - * @param gSiteMonitorInfo 站点基础信息 - * @return 结果 - */ - @Override - public int insertGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo) - { - gSiteMonitorInfo.setCreateTime(DateUtils.getNowDate()); - return gSiteMonitorInfoMapper.insertGSiteInfo(gSiteMonitorInfo); - } + + /** * 修改站点基础信息 @@ -85,22 +64,12 @@ public class GSiteMonitorInfoServiceImpl implements IGSiteMonitorInfoService if(Objects.isNull(gSiteMonitorInfoMapper.selectGSiteInfoBySiteId(gSiteMonitorInfo.getSiteId()))){ //没有该条数据，则新增 gSiteMonitorInfo.setCreateTime(DateUtils.getNowDate()); - return insertGSiteInfo(gSiteMonitorInfo); + return gSiteMonitorInfoMapper.insert(gSiteMonitorInfo); } gSiteMonitorInfo.setUpdateTime(DateUtils.getNowDate()); return gSiteMonitorInfoMapper.updateGSiteInfo(gSiteMonitorInfo); } - /** - * 批量删除站点基础信息 - * - * @param ids 需要删除的站点基础信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteInfoByIds(Long[] ids) - { - return gSiteMonitorInfoMapper.deleteGSiteInfoByIds(ids); - } + } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java index 7d6688e..bc2b257 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java @@ -36,30 +36,6 @@ public class GSitePumpInfoServiceImpl implements IGSitePumpInfoService return gSitePumpInfoMapper.selectGSitePumpInfoBySiteId(SiteId); } - /** - * 查询泵站信息列表 - * - * @param gSitePumpInfo 泵站信息 - * @return 泵站信息 - */ - @Override - public List selectGSitePumpInfoList(GSitePumpInfo gSitePumpInfo) - { - return gSitePumpInfoMapper.selectGSitePumpInfoList(gSitePumpInfo); - } - - /** - * 新增泵站信息 - * - * @param gSitePumpInfo 泵站信息 - * @return 结果 - */ - @Override - public int insertGSitePumpInfo(GSitePumpInfo gSitePumpInfo) - { - gSitePumpInfo.setCreateTime(DateUtils.getNowDate()); - return gSitePumpInfoMapper.insertGSitePumpInfo(gSitePumpInfo); - } /** * 修改泵站信息 @@ -80,27 +56,4 @@ public class GSitePumpInfoServiceImpl implements IGSitePumpInfoService return gSitePumpInfoMapper.updateGSitePumpInfo(gSitePumpInfo); } - /** - * 批量删除泵站信息 - * - * @param ids 需要删除的泵站信息主键 - * @return 结果 - */ - @Override - public int deleteGSitePumpInfoByIds(Long[] ids) - { - return gSitePumpInfoMapper.deleteGSitePumpInfoByIds(ids); - } - - /** - * 删除泵站信息信息 - * - * @param id 泵站信息主键 - * @return 结果 - */ - @Override - public int deleteGSitePumpInfoById(Long id) - { - return gSitePumpInfoMapper.deleteGSitePumpInfoById(id); - } } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java index 2c2c5ad..cde90f7 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java @@ -23,17 +23,7 @@ public class GSiteReservoirInfoServiceImpl implements IGSiteReservoirInfoService @Autowired private GSiteReservoirInfoMapper gSiteReservoirInfoMapper; - /** - * 查询水库站点基础信息 - * - * @param siteId 水库站点id - * @return 水库站点基础信息 - */ - @Override - public GSiteReservoirInfo selectGSiteReservoirInfoById(Long siteId) - { - return gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(siteId); - } + /** * 根据站点的id查询水闸的站点信息 @@ -41,33 +31,8 @@ public class GSiteReservoirInfoServiceImpl implements IGSiteReservoirInfoService * @return 水闸站点的信息 */ - public List selectGSiteReservoirInfoBySiteId(Long siteId){ - return (List) gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(siteId); - } - - /** - * 查询水库站点基础信息列表 - * - * @param gSiteReservoirInfo 水库站点基础信息 - * @return 水库站点基础信息 - */ - @Override - public List selectGSiteReservoirInfoList(GSiteReservoirInfo gSiteReservoirInfo) - { - return gSiteReservoirInfoMapper.selectGSiteReservoirInfoList(gSiteReservoirInfo); - } - - /** - * 新增水库站点基础信息 - * - * @param gSiteReservoirInfo 水库站点基础信息 - * @return 结果 - */ - @Override - public int insertGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo) - { - gSiteReservoirInfo.setCreateTime(DateUtils.getNowDate()); - return gSiteReservoirInfoMapper.insertGSiteReservoirInfo(gSiteReservoirInfo); + public GSiteReservoirInfo selectGSiteReservoirInfoBySiteId(Long siteId){ + return gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(siteId); } /** @@ -87,33 +52,10 @@ public class GSiteReservoirInfoServiceImpl implements IGSiteReservoirInfoService if(Objects.isNull(gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(gSiteReservoirInfo.getSiteId()))){ //没有该条数据则新增 gSiteReservoirInfo.setCreateTime(DateUtils.getNowDate()); - return insertGSiteReservoirInfo(gSiteReservoirInfo); + return gSiteReservoirInfoMapper.insert(gSiteReservoirInfo); } gSiteReservoirInfo.setUpdateTime(DateUtils.getNowDate()); return gSiteReservoirInfoMapper.updateGSiteReservoirInfo(gSiteReservoirInfo); } - /** - * 批量删除水库站点基础信息 - * - * @param ids 需要删除的水库站点基础信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteReservoirInfoByIds(Long[] ids) - { - return gSiteReservoirInfoMapper.deleteGSiteReservoirInfoByIds(ids); - } - - /** - * 删除水库站点基础信息信息 - * - * @param id 水库站点基础信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteReservoirInfoById(Long id) - { - return gSiteReservoirInfoMapper.deleteGSiteReservoirInfoById(id); - } } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java index 97a8570..f29be7c 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java @@ -32,35 +32,11 @@ public class GSiteRiverInfoServiceImpl implements IGSiteRiverInfoService * @return 河流基础信息 */ @Override - public GSiteRiverInfo selectGRiverInfoById(Long id) + public GSiteRiverInfo selectGRiverInfoBySiteId(Long id) { return gSiteRiverInfoMapper.selectGRiverInfoBySiteId(id); } - /** - * 查询河流基础信息列表 - * - * @param gSiteRiverInfo 河流基础信息 - * @return 河流基础信息 - */ - @Override - public List selectGRiverInfoList(GSiteRiverInfo gSiteRiverInfo) - { - return gSiteRiverInfoMapper.selectGRiverInfoList(gSiteRiverInfo); - } - - /** - * 新增河流基础信息 - * - * @param gSiteRiverInfo 河流基础信息 - * @return 结果 - */ - @Override - public int insertGRiverInfo(GSiteRiverInfo gSiteRiverInfo) - { - gSiteRiverInfo.setCreateTime(DateUtils.getNowDate()); - return gSiteRiverInfoMapper.insertGRiverInfo(gSiteRiverInfo); - } /** * 修改河流基础信息 @@ -79,33 +55,10 @@ public class GSiteRiverInfoServiceImpl implements IGSiteRiverInfoService if(Objects.isNull(gSiteRiverInfoMapper.selectGRiverInfoBySiteId(gSiteRiverInfo.getSiteId()))){ //没有该条数据则新增 gSiteRiverInfo.setCreateTime(DateUtils.getNowDate()); - return insertGRiverInfo(gSiteRiverInfo); + return gSiteRiverInfoMapper.insert(gSiteRiverInfo); } gSiteRiverInfo.setUpdateTime(DateUtils.getNowDate()); return gSiteRiverInfoMapper.updateGRiverInfo(gSiteRiverInfo); } - /** - * 批量删除河流基础信息 - * - * @param ids 需要删除的河流基础信息主键 - * @return 结果 - */ - @Override - public int deleteGRiverInfoByIds(Long[] ids) - { - return gSiteRiverInfoMapper.deleteGRiverInfoByIds(ids); - } - - /** - * 删除河流基础信息信息 - * - * @param id 河流基础信息主键 - * @return 结果 - */ - @Override - public int deleteGRiverInfoById(Long id) - { - return gSiteRiverInfoMapper.deleteGRiverInfoById(id); - } } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java index fb6d1fa..399d5d0 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java @@ -23,17 +23,7 @@ public class GSiteSluiceInfoServiceImpl implements IGSiteSluiceInfoService @Autowired private GSiteSluiceInfoMapper gSiteSluiceInfoMapper; - /** - * 查询水闸基本信息 - * - * @param id 水闸基本信息主键 - * @return 水闸基本信息 - */ - @Override - public GSiteSluiceInfo selectGSiteSluiceInfoById(Long id) - { - return gSiteSluiceInfoMapper.selectGSiteSluiceInfoById(id); - } + /** * 根据站点的id查询水闸的站点信息 * @@ -41,58 +31,12 @@ public class GSiteSluiceInfoServiceImpl implements IGSiteSluiceInfoService * @return 水闸站点的信息 */ @Override - public List selectGSiteSluiceInfoBySiteId(Long siteId) + public GSiteSluiceInfo selectGSiteSluiceInfoBySiteId(Long siteId) { return gSiteSluiceInfoMapper.selectGSiteSluiceInfoBySiteId(siteId); } - /** - * 查询水闸基本信息列表 - * - * @param gSiteSluiceInfo 水闸基本信息 - * @return 水闸基本信息 - */ - @Override - public List selectGSiteSluiceInfoList(GSiteSluiceInfo gSiteSluiceInfo) - { - return gSiteSluiceInfoMapper.selectGSiteSluiceInfoList(gSiteSluiceInfo); - } - /** - * 新增水闸基本信息 - * - * @param gSiteSluiceInfo 水闸基本信息 - * @return 结果 - */ - @Override - public int insertGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo) - { - gSiteSluiceInfo.setCreateTime(DateUtils.getNowDate()); - return gSiteSluiceInfoMapper.insertGSiteSluiceInfo(gSiteSluiceInfo); - } - /** - * 批量删除水闸基本信息 - * - * @param ids 需要删除的水闸基本信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteSluiceInfoByIds(Long[] ids) - { - return gSiteSluiceInfoMapper.deleteGSiteSluiceInfoByIds(ids); - } - - /** - * 删除水闸基本信息信息 - * - * @param id 水闸基本信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteSluiceInfoById(Long id) - { - return gSiteSluiceInfoMapper.deleteGSiteSluiceInfoById(id); - } /** * * @param gSiteSluiceInfo 修改水闸的基本信息 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java index 5925ace..66c0232 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java @@ -17,6 +17,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fastbee.common.exception.ServiceException; +import com.fastbee.common.utils.json.JsonStrUtil; +import com.fastbee.common.utils.validate.LongitudeLatitudeValidateUtils; import com.fastbee.ggroup.domain.GSiteGroups; import com.fastbee.ggroup.domain.dto.GGroupSiteDto; import com.fastbee.ggroup.domain.dto.GGroupSiteRelateDto; @@ -97,7 +99,7 @@ public class GSitesServiceImpl extends ServiceImpl= -180 && value <= 180; // 经度范围 - } catch (NumberFormatException e) { - // 字符串无法转换为数字，认为不在范围内 - return false; - } - } - /** * 修改站点 */ @@ -209,36 +180,12 @@ public class GSitesServiceImpl extends ServiceImpl projectDeptList = new LambdaQueryChainWrapper<>(sysDeptMapper) + .select(SysDept::getDeptId) .eq(SysDept::getProjectId, projectId) .eq(SysDept::getDelFlag, "0") .list();