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

站点基本信息接口完善等

Browse Source
This commit is contained in:
mi9688 2024-11-05 16:04:51 +08:00
parent e18e832250
commit 5c0027abeb
27 changed files with 102 additions and 870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fastbee-common/src/main/java/com/fastbee/common/utils/json/JsonStrUtil.java
View File

@ -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;
}
}

36
fastbee-common/src/main/java/com/fastbee/common/utils/validate/LongitudeLatitudeValidateUtils.java Normal file
View File

@ -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;
}
}
}

59
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java
View File

@ -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<GSiteIrrigateInfo> list = gSiteIrrigateInfoService.selectGSiteIrrigateInfoList(gSiteIrrigateInfo);
return getDataTable(list);
}
/**
* 导出灌区基础信息列表
*/
@ApiOperation("导出灌区基础信息列表")
// @PreAuthorize("@ss.hasPermi('ggroup:info:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, GSiteIrrigateInfo gSiteIrrigateInfo)
{
List<GSiteIrrigateInfo> list = gSiteIrrigateInfoService.selectGSiteIrrigateInfoList(gSiteIrrigateInfo);
ExcelUtil<GSiteIrrigateInfo> util = new ExcelUtil<GSiteIrrigateInfo>(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));
}
}

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

@ -40,29 +40,6 @@ public class GSiteMonitorInfoController extends BaseController
this.gSiteInfoService = gSiteInfoService;
}
/**
* 查询站点基础信息列表
*/
@GetMapping("/list")
@ApiOperation("查询站点基础信息列表")
public TableDataInfo list(GSiteMonitorInfo gSiteMonitorInfo)
{
startPage();
List<GSiteMonitorInfo> list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo);
return getDataTable(list);
}
/**
* 导出站点基础信息列表
*/
@ApiOperation("导出站点基础信息列表")
@PostMapping("/export")
public void export(HttpServletResponse response, GSiteMonitorInfo gSiteMonitorInfo)
{
List<GSiteMonitorInfo> list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo);
ExcelUtil<GSiteMonitorInfo> 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));
}
}

48
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java
View File

@ -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<GSitePumpInfo> list = gSitePumpInfoService.selectGSitePumpInfoList(gSitePumpInfo);
return getDataTable(list);
}
/**
* 导出泵站信息列表
*/
@ApiOperation("导出泵站信息列表")
@PreAuthorize("@ss.hasPermi('ggroup:info:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, GSitePumpInfo gSitePumpInfo)
{
List<GSitePumpInfo> list = gSitePumpInfoService.selectGSitePumpInfoList(gSitePumpInfo);
ExcelUtil<GSitePumpInfo> util = new ExcelUtil<GSitePumpInfo>(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));
}
}

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

@ -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<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获取水库站点基础信息详细信息
*/
@ -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));
}
}

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

@ -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<GSiteRiverInfo> 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<GSiteRiverInfo> 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<GSiteRiverInfo> list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo);
ExcelUtil<GSiteRiverInfo> util = new ExcelUtil<GSiteRiverInfo>(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));
}
}

60
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java
View File

@ -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<GSiteSluiceInfo> list = gSiteSluiceInfoService.selectGSiteSluiceInfoList(gSiteSluiceInfo);
return getDataTable(list);
}
/**
* 导出水闸基本信息列表
*/
@ApiOperation("导出水闸基本信息列表")
// @PreAuthorize("@ss.hasPermi('ggroup:info:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, GSiteSluiceInfo gSiteSluiceInfo)
{
List<GSiteSluiceInfo> list = gSiteSluiceInfoService.selectGSiteSluiceInfoList(gSiteSluiceInfo);
ExcelUtil<GSiteSluiceInfo> util = new ExcelUtil<GSiteSluiceInfo>(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));
}
/**
* 更新水库的基本信息
*/
}

3
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java
View File

@ -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;
}

4
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java
View File

@ -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<GSiteIrrigateInfo>
{
/**
* 查询灌区基础信息

4
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java
View File

@ -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<GSiteReservoirInfo>
{
/**
* 查询水库站点基础信息

2
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java
View File

@ -28,7 +28,7 @@ public interface GSiteSluiceInfoMapper extends BaseMapper<GSiteSluiceInfo>
* @param siteId 水闸基本信息主键
* @return 水闸基本信息
*/
public List<GSiteSluiceInfo> selectGSiteSluiceInfoBySiteId(Long siteId);
public GSiteSluiceInfo selectGSiteSluiceInfoBySiteId(Long siteId);
/**
* 查询水闸基本信息列表
*

31
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java
View File

@ -25,37 +25,6 @@ public interface IGSiteIrrigateInfoService
* @return 结果
*/
public int updateGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo);
/**
* 查询灌区基础信息列表
*
* @param gSiteIrrigateInfo 灌区基础信息
* @return 灌区基础信息集合
*/
public List<GSiteIrrigateInfo> 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);
}

22
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java
View File

@ -19,21 +19,7 @@ public interface IGSiteMonitorInfoService
*/
GSiteMonitorInfo selectGSiteInfoById(Long id);
/**
* 查询站点基础信息列表
*
* @param gSiteMonitorInfo 站点基础信息
* @return 站点基础信息集合
*/
List<GSiteMonitorInfo> 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);
}

31
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java
View File

@ -19,22 +19,6 @@ public interface IGSitePumpInfoService
*/
public GSitePumpInfo selectGSitePumpInfoBySiteId(Long SiteId);
/**
* 查询泵站信息列表
*
* @param gSitePumpInfo 泵站信息
* @return 泵站信息集合
*/
public List<GSitePumpInfo> 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);
}

40
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java
View File

@ -7,17 +7,10 @@ import com.fastbee.ggroup.domain.GSiteReservoirInfo;
* 水库站点基础信息Service接口
*
* @author kerwincui
* @date 2024-10-23
* &#064;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<GSiteReservoirInfo> selectGSiteReservoirInfoBySiteId(Long siteId);
/**
* 查询水库站点基础信息列表
*
* @param gSiteReservoirInfo 水库站点基础信息
* @return 水库站点基础信息集合
*/
public List<GSiteReservoirInfo> 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);
}

34
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java
View File

@ -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<GSiteRiverInfo> 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);
}

42
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java
View File

@ -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<GSiteSluiceInfo> selectGSiteSluiceInfoBySiteId(Long siteId);
/**
* 查询水闸基本信息列表
*
* @param gSiteSluiceInfo 水闸基本信息
* @return 水闸基本信息集合
*/
public List<GSiteSluiceInfo> 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);
}

52
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java
View File

@ -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<GSiteIrrigateInfo> 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);
}
}

39
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java
View File

@ -40,30 +40,9 @@ public class GSiteMonitorInfoServiceImpl implements IGSiteMonitorInfoService
return gSiteMonitorInfoMapper.selectGSiteInfoBySiteId(id);
}
/**
* 查询站点基础信息列表
*
* @param gSiteMonitorInfo 站点基础信息
* @return 站点基础信息
*/
@Override
public List<GSiteMonitorInfo> 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);
}
}

47
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java
View File

@ -36,30 +36,6 @@ public class GSitePumpInfoServiceImpl implements IGSitePumpInfoService
return gSitePumpInfoMapper.selectGSitePumpInfoBySiteId(SiteId);
}
/**
* 查询泵站信息列表
*
* @param gSitePumpInfo 泵站信息
* @return 泵站信息
*/
@Override
public List<GSitePumpInfo> 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);
}
}

66
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java
View File

@ -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<GSiteReservoirInfo> selectGSiteReservoirInfoBySiteId(Long siteId){
return (List<GSiteReservoirInfo>) gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(siteId);
}
/**
* 查询水库站点基础信息列表
*
* @param gSiteReservoirInfo 水库站点基础信息
* @return 水库站点基础信息
*/
@Override
public List<GSiteReservoirInfo> 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);
}
}

51
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java
View File

@ -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<GSiteRiverInfo> 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);
}
}

60
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java
View File

@ -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<GSiteSluiceInfo> selectGSiteSluiceInfoBySiteId(Long siteId)
public GSiteSluiceInfo selectGSiteSluiceInfoBySiteId(Long siteId)
{
return gSiteSluiceInfoMapper.selectGSiteSluiceInfoBySiteId(siteId);
}
/**
* 查询水闸基本信息列表
*
* @param gSiteSluiceInfo 水闸基本信息
* @return 水闸基本信息
*/
@Override
public List<GSiteSluiceInfo> 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 修改水闸的基本信息

67
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java
View File

@ -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<GSiteGroupsMapper,GSiteGroups
if(StringUtils.isBlank(gGroupSiteDto.getIcon())){
throw new ServiceException("请选择站点图标！");
}
//设置坐标值等信息
//读取上传的站点图json信息进行校验并赋值到对应属性
getReadJsonFileContent(gSites);
//设置行政区域编码
gSites.setAreaCode(gGroupSiteDto.getAreaCode());
@ -112,7 +114,7 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
}
/**
* 读取上传的站点图信息并赋值
* 读取上传的站点图json信息进行校验并赋值到对应属性
*/
private void getReadJsonFileContent(GSites gSites) {
//TODO 路径优化
@ -134,7 +136,7 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
throw new ServiceException("上传站点地图json数据为空！");
}
//校验文件内容是否是json格式
if (!isValidJson(jsonData)) {
if (!JsonStrUtil.isValidJson(jsonData)) {
throw new ServiceException("json格式不正确！");
}
//校验json对象是否合法
@ -151,48 +153,17 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
JSONArray jsonArray = JSONUtil.parseArray(coordinates);
//判断数组每个元素必须为经度或纬度
for (Object o : jsonArray) {
if(!isLongitudeOrLatitude(o.toString())){
if(!LongitudeLatitudeValidateUtils.isLongitudeOrLatitude(o.toString())){
throw new ServiceException("coordinates数组元素必须为经度或纬度！");
}
}
int startIndex = space.indexOf("/profile/upload/");
String relativeUrl = space.substring(startIndex);
gSites.setSpace(relativeUrl);
gSites.setSpaceValue(jsonData);
}
/**
* 判断字符串是不是经度或者纬度
* @param str 经纬度字符串
* @return true 或 false
*/
private 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 否则
*/
private static boolean isValueInRange(String str) {
try {
double value = Double.parseDouble(str);
return value >= -180 && value <= 180; // 经度范围
} catch (NumberFormatException e) {
// 字符串无法转换为数字，认为不在范围内
return false;
}
}
/**
* 修改站点
*/
@ -209,36 +180,12 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
GSites sites = new GSites();
BeanUtils.copyProperties(gSitesEditDto, sites);
//读取文件内容
//读取上传的站点图json信息进行校验并赋值到对应属性
getReadJsonFileContent(sites);
return gSitesMapper.updateById(sites);
}
/**
* 验证字符串是否是json格式
*/
public boolean isValidJson(String jsonStr) {
try {
JSONUtil.parseObj(jsonStr);
} catch (JSONException e) {
return false;
}
return true;
}
/**
* 验证json对象是否是数组
*/
public boolean isValidJsonArray(String jsonStr) {
try {
JSONUtil.parseArray(jsonStr);
} catch (JSONException e) {
return false;
}
return true;
}
/**
* 批量删除站点

2
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java
View File

@ -80,7 +80,7 @@ public class Project extends BaseEntity
@ApiModelProperty("项目介绍")
private String introduce;
/** 删除状态[1删除,-1未删除] */
/** 删除状态[2删除,0未删除] */
private Long delFlag;
/** 项目介绍 */

1
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
View File

@ -342,6 +342,7 @@ public class ProjectServiceImpl implements IProjectService
.update();
//查询项目下的机构
List<SysDept> projectDeptList = new LambdaQueryChainWrapper<>(sysDeptMapper)
.select(SysDept::getDeptId)
.eq(SysDept::getProjectId, projectId)
.eq(SysDept::getDelFlag, "0")
.list();