From 9912eb56714192fb10cabfb6a2cd36929e35494d Mon Sep 17 00:00:00 2001 From: mi9688 Date: Wed, 23 Oct 2024 18:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E6=B5=81=EF=BC=8C=E6=B0=B4=E5=BA=93?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/SysUser.java | 4 + .../controller/gis/GGroupsController.java | 2 +- .../controller/gis/GLegendController.java | 2 +- ...r.java => GSiteMonitorInfoController.java} | 32 +-- .../gis/GSiteReservoirInfoController.java | 110 ++++++++ ...ler.java => GSiteRiverInfoController.java} | 38 ++- .../controller/project/ProjectController.java | 2 +- .../com/fastbee/ggroup/domain/GGroups.java | 4 +- .../{GSiteInfo.java => GSiteMonitorInfo.java} | 5 +- .../ggroup/domain/GSiteReservoirInfo.java | 217 +++++++++++++++ .../{GRiverInfo.java => GSiteRiverInfo.java} | 4 +- .../ggroup/enums/SiteTypeCategoryEnum.java | 15 +- ...apper.java => GSiteMonitorInfoMapper.java} | 18 +- .../mapper/GSiteReservoirInfoMapper.java | 63 +++++ ...oMapper.java => GSiteRiverInfoMapper.java} | 21 +- ...ice.java => IGSiteMonitorInfoService.java} | 18 +- .../service/IGSiteReservoirInfoService.java | 61 +++++ ...rvice.java => IGSiteRiverInfoService.java} | 18 +- .../service/impl/GGroupsServiceImpl.java | 3 +- .../service/impl/GLegendServiceImpl.java | 7 + .../service/impl/GRiverInfoServiceImpl.java | 96 ------- .../service/impl/GSiteInfoServiceImpl.java | 106 -------- .../impl/GSiteMonitorInfoServiceImpl.java | 106 ++++++++ .../impl/GSiteReservoirInfoServiceImpl.java | 109 ++++++++ .../impl/GSiteRiverInfoServiceImpl.java | 111 ++++++++ .../service/impl/GSitesServiceImpl.java | 37 ++- .../resources/mapper/ggroup/GGroupsMapper.xml | 2 +- ...oMapper.xml => GSiteMonitorInfoMapper.xml} | 22 +- .../ggroup/GSiteReservoirInfoMapper.xml | 248 ++++++++++++++++++ ...nfoMapper.xml => GSiteRiverInfoMapper.xml} | 24 +- .../com/fastbee/project/domain/Project.java | 2 +- .../project/service/IProjectService.java | 2 +- .../service/impl/ProjectServiceImpl.java | 56 ++-- .../mapper/project/ProjectMapper.xml | 18 +- .../fastbee/system/mapper/SysUserMapper.java | 3 +- 35 files changed, 1235 insertions(+), 351 deletions(-) rename fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/{GSiteInfoController.java => GSiteMonitorInfoController.java} (67%) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java rename fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/{GRiverInfoController.java => GSiteRiverInfoController.java} (71%) rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/{GSiteInfo.java => GSiteMonitorInfo.java} (94%) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteReservoirInfo.java rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/{GRiverInfo.java => GSiteRiverInfo.java} (97%) rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/{GSiteInfoMapper.java => GSiteMonitorInfoMapper.java} (64%) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/{GRiverInfoMapper.java => GSiteRiverInfoMapper.java} (58%) rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/{IGSiteInfoService.java => IGSiteMonitorInfoService.java} (59%) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java rename fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/{IGRiverInfoService.java => IGSiteRiverInfoService.java} (64%) delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GRiverInfoServiceImpl.java delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java rename fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/{GSiteInfoMapper.xml => GSiteMonitorInfoMapper.xml} (93%) create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteReservoirInfoMapper.xml rename fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/{GRiverInfoMapper.xml => GSiteRiverInfoMapper.xml} (95%) diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java index 109e25c..ddc6cdb 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/entity/SysUser.java @@ -6,6 +6,8 @@ import javax.validation.constraints.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fastbee.common.annotation.Excel; @@ -20,7 +22,9 @@ import com.fastbee.common.xss.Xss; * * @author ruoyi */ +@EqualsAndHashCode(callSuper = true) @ApiModel(value = "SysUser", description = "用户对象 sys_user") +@Data public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java index ca76450..a8811e8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GGroupsController.java @@ -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; diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java index 1c3691f..f7a8f6b 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java @@ -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 { diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java similarity index 67% rename from fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteInfoController.java rename to fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java index 86594de..31dc7e9 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteMonitorInfoController.java @@ -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 list = gSiteInfoService.selectGSiteInfoList(gSiteInfo); + List 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 list = gSiteInfoService.selectGSiteInfoList(gSiteInfo); - ExcelUtil util = new ExcelUtil<>(GSiteInfo.class); + List list = gSiteInfoService.selectGSiteInfoList(gSiteMonitorInfo); + ExcelUtil 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)); } /** 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 new file mode 100644 index 0000000..2aae47e --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteReservoirInfoController.java @@ -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 + * @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 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获取水库站点基础信息详细信息 + */ +// @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)); + } +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GRiverInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java similarity index 71% rename from fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GRiverInfoController.java rename to fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java index 7c56657..8ab5cf8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GRiverInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteRiverInfoController.java @@ -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 list = gRiverInfoService.selectGRiverInfoList(gRiverInfo); + List 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 list = gRiverInfoService.selectGRiverInfoList(gRiverInfo); + GSiteRiverInfo gSiteRiverInfo = new GSiteRiverInfo(); + gSiteRiverInfo.setSiteId(stationId); + List 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 list = gRiverInfoService.selectGRiverInfoList(gRiverInfo); - ExcelUtil util = new ExcelUtil(GRiverInfo.class); + List list = gRiverInfoService.selectGRiverInfoList(gSiteRiverInfo); + ExcelUtil util = new ExcelUtil(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)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/project/ProjectController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/project/ProjectController.java index e710a61..c486cde 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/project/ProjectController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/project/ProjectController.java @@ -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)); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java index 1a38dee..97cda33 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java @@ -72,12 +72,9 @@ private static final long serialVersionUID = 1L; /** 显示顺序 */ private Integer orderNum; - - /** 子组 */ private List children = new ArrayList<>(); - /**节点类型：0组，1站点 */ private Integer nodeType= 0; @@ -87,4 +84,5 @@ private static final long serialVersionUID = 1L; /**站点类型 */ private String siteType; + } \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteMonitorInfo.java similarity index 94% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteMonitorInfo.java index 11fdf22..16638c7 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteMonitorInfo.java @@ -4,9 +4,6 @@ import java.math.BigDecimal; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.fastbee.common.annotation.Excel; import com.fastbee.common.core.domain.BaseEntity; @@ -21,7 +18,7 @@ import com.fastbee.common.core.domain.BaseEntity; @Data @NoArgsConstructor @AllArgsConstructor -public class GSiteInfo extends BaseEntity +public class GSiteMonitorInfo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteReservoirInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteReservoirInfo.java new file mode 100644 index 0000000..e73b200 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteReservoirInfo.java @@ -0,0 +1,217 @@ +package com.fastbee.ggroup.domain; + +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.fastbee.common.annotation.Excel; +import com.fastbee.common.core.domain.BaseEntity; + +/** + * 水库站点基础信息对象 g_site_reservoir_info + * + * @author kerwincui + * @date 2024-10-23 + */ +@ApiModel(value = "GSiteReservoirInfo",description = "水库站点基础信息 g_site_reservoir_info") +@Data +@EqualsAndHashCode(callSuper = true) +public class GSiteReservoirInfo extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 工程名称 */ + @Excel(name = "工程名称") + @ApiModelProperty("工程名称") + private String projectName; + + /** 地理坐标 */ + @Excel(name = "地理坐标") + @ApiModelProperty("地理坐标") + private String geoCoordinates; + + /** 工程位置 */ + @Excel(name = "工程位置") + @ApiModelProperty("工程位置") + private String projectLocation; + + /** 所在流域 */ + @Excel(name = "所在流域") + @ApiModelProperty("所在流域") + private String drainageBasin; + + /** 所在水系 */ + @Excel(name = "所在水系") + @ApiModelProperty("所在水系") + private String drainageSystem; + + /** 所在河流 */ + @Excel(name = "所在河流") + @ApiModelProperty("所在河流") + private String river; + + /** 所在乡镇/村 */ + @Excel(name = "所在乡镇/村") + @ApiModelProperty("所在乡镇/村") + private String townVillage; + + /** 水库类型 */ + @Excel(name = "水库类型") + @ApiModelProperty("水库类型") + private String reservoirType; + + /** 水库功能 */ + @Excel(name = "水库功能") + @ApiModelProperty("水库功能") + private String reservoirFunction; + + /** 工程建设情况 */ + @Excel(name = "工程建设情况") + @ApiModelProperty("工程建设情况") + private String constructionStatus; + + /** 水库级别 */ + @Excel(name = "水库级别") + @ApiModelProperty("水库级别") + private String reservoirLevel; + + /** 主坝级别 */ + @Excel(name = "主坝级别") + @ApiModelProperty("主坝级别") + private String mainDamLevel; + + /** 主坝尺寸坝高 */ + @Excel(name = "主坝尺寸坝高") + @ApiModelProperty("主坝尺寸坝高") + private BigDecimal mainDamHeight; + + /** 主坝尺寸坝长 */ + @Excel(name = "主坝尺寸坝长") + @ApiModelProperty("主坝尺寸坝长") + private BigDecimal mainDamLength; + + /** 坝顶高程 */ + @Excel(name = "坝顶高程") + @ApiModelProperty("坝顶高程") + private BigDecimal damCrestElevation; + + /** 正常蓄水位 */ + @Excel(name = "正常蓄水位") + @ApiModelProperty("正常蓄水位") + private BigDecimal normalStorageLevel; + + /** 死水位 */ + @Excel(name = "死水位") + @ApiModelProperty("死水位") + private BigDecimal deadWaterLevel; + + /** 总库容 */ + @Excel(name = "总库容") + @ApiModelProperty("总库容") + private Long totalCapacity; + + /** 兴利库容 */ + @Excel(name = "兴利库容") + @ApiModelProperty("兴利库容") + private Long beneficialCapacity; + + /** 死库容 */ + @Excel(name = "死库容") + @ApiModelProperty("死库容") + private Long deadStorage; + + /** 正常蓄水位相应水面面积 */ + @Excel(name = "正常蓄水位相应水面面积") + @ApiModelProperty("正常蓄水位相应水面面积") + private Integer normalStorageArea; + + /** 设计年供水量 */ + @Excel(name = "设计年供水量") + @ApiModelProperty("设计年供水量") + private Long annualSupplyCapacity; + + /** 行政责任人 */ + @Excel(name = "行政责任人") + @ApiModelProperty("行政责任人") + private String administrativeResponsible; + + /** 行政责任人单位名称 */ + @Excel(name = "行政责任人单位名称") + @ApiModelProperty("行政责任人单位名称") + private String administrativeUnitName; + + /** 行政责任人职务 */ + @Excel(name = "行政责任人职务") + @ApiModelProperty("行政责任人职务") + private String administrativePosition; + + /** 行政责任人电话 */ + @Excel(name = "行政责任人电话") + @ApiModelProperty("行政责任人电话") + private String administrativePhone; + + /** 技术责任人 */ + @Excel(name = "技术责任人") + @ApiModelProperty("技术责任人") + private String technicalResponsible; + + /** 技术责任人单位名称 */ + @Excel(name = "技术责任人单位名称") + @ApiModelProperty("技术责任人单位名称") + private String technicalUnitName; + + /** 技术责任人职务 */ + @Excel(name = "技术责任人职务") + @ApiModelProperty("技术责任人职务") + private String technicalPosition; + + /** 技术责任人电话 */ + @Excel(name = "技术责任人电话") + @ApiModelProperty("技术责任人电话") + private String technicalPhone; + + /** 巡查责任人 */ + @Excel(name = "巡查责任人") + @ApiModelProperty("巡查责任人") + private String inspectionResponsible; + + /** 巡查责任人单位名称 */ + @Excel(name = "巡查责任人单位名称") + @ApiModelProperty("巡查责任人单位名称") + private String inspectionUnitName; + + /** 巡查责任人职务 */ + @Excel(name = "巡查责任人职务") + @ApiModelProperty("巡查责任人职务") + private String inspectionPosition; + + /** 巡查责任人电话 */ + @Excel(name = "巡查责任人电话") + @ApiModelProperty("巡查责任人电话") + private String inspectionPhone; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createdBy; + + /** 更新人 */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") + private String updatedBy; + + /** 删除标志（0:正常,2:删除） */ + private Integer delFlag; + + /** 所属站点ID */ + @Excel(name = "所属站点ID") + @ApiModelProperty("所属站点ID") + private Long siteId; + +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GRiverInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteRiverInfo.java similarity index 97% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GRiverInfo.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteRiverInfo.java index d090f1c..a3aed8d 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GRiverInfo.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteRiverInfo.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.fastbee.common.annotation.Excel; import com.fastbee.common.core.domain.BaseEntity; @@ -18,7 +16,7 @@ import com.fastbee.common.core.domain.BaseEntity; @ApiModel(value = "GRiverInfo",description = "河流基础信息 g_river_info") @Data @EqualsAndHashCode(callSuper = true) -public class GRiverInfo extends BaseEntity +public class GSiteRiverInfo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/SiteTypeCategoryEnum.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/SiteTypeCategoryEnum.java index cb8f8b8..d247810 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/SiteTypeCategoryEnum.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/enums/SiteTypeCategoryEnum.java @@ -12,7 +12,7 @@ public enum SiteTypeCategoryEnum { //水利设施与管理 WATER_MANAGEMENT("水利设施与管理"), //检测站 - DETECTION_STATION("检测站"), + DETECTION_STATION("监测站"), //公共设施 PUBLIC_FACILITIES("公共设施"), //报警事件 @@ -20,7 +20,6 @@ public enum SiteTypeCategoryEnum { //其他 OTHER("其他"); - private final String name; SiteTypeCategoryEnum(String name){this.name = name;} @@ -32,4 +31,16 @@ public enum SiteTypeCategoryEnum { } return null; } + + /** + * 判断变量值是否包含在枚举值里面 + */ + public static boolean contains(String value) { + for (SiteTypeCategoryEnum siteTypeCategoryEnum : SiteTypeCategoryEnum.values()) { + if (siteTypeCategoryEnum.getName().equals(value)) { + return true; + } + } + return false; + } } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteMonitorInfoMapper.java similarity index 64% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteInfoMapper.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteMonitorInfoMapper.java index 7bbd81b..4e3ab25 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteInfoMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteMonitorInfoMapper.java @@ -3,7 +3,7 @@ package com.fastbee.ggroup.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.fastbee.ggroup.domain.GSiteInfo; +import com.fastbee.ggroup.domain.GSiteMonitorInfo; import org.apache.ibatis.annotations.Mapper; /** @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @date 2024-10-10 */ @Mapper -public interface GSiteInfoMapper extends BaseMapper +public interface GSiteMonitorInfoMapper extends BaseMapper { /** * 查询站点基础信息 @@ -21,31 +21,31 @@ public interface GSiteInfoMapper extends BaseMapper * @param id 站点基础信息主键 * @return 站点基础信息 */ - GSiteInfo selectGSiteInfoById(Long id); + GSiteMonitorInfo selectGSiteInfoBySiteId(Long id); /** * 查询站点基础信息列表 * - * @param gSiteInfo 站点基础信息 + * @param gSiteMonitorInfo 站点基础信息 * @return 站点基础信息集合 */ - List selectGSiteInfoList(GSiteInfo gSiteInfo); + List selectGSiteInfoList(GSiteMonitorInfo gSiteMonitorInfo); /** * 新增站点基础信息 * - * @param gSiteInfo 站点基础信息 + * @param gSiteMonitorInfo 站点基础信息 * @return 结果 */ - int insertGSiteInfo(GSiteInfo gSiteInfo); + int insertGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo); /** * 修改站点基础信息 * - * @param gSiteInfo 站点基础信息 + * @param gSiteMonitorInfo 站点基础信息 * @return 结果 */ - int updateGSiteInfo(GSiteInfo gSiteInfo); + int updateGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo); /** * 删除站点基础信息 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 new file mode 100644 index 0000000..ea1c753 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteReservoirInfoMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.ggroup.mapper; + +import java.util.List; +import com.fastbee.ggroup.domain.GSiteReservoirInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 水库站点基础信息Mapper接口 + * + * @author kerwincui + * @date 2024-10-23 + */ +@Mapper +public interface GSiteReservoirInfoMapper +{ + /** + * 查询水库站点基础信息 + * + * @param siteId 水库基础信息所属站点id + * @return 水库站点基础信息 + */ + public GSiteReservoirInfo selectGSiteReservoirInfoBySiteId(Long siteId); + + /** + * 查询水库站点基础信息列表 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 水库站点基础信息集合 + */ + public List selectGSiteReservoirInfoList(GSiteReservoirInfo gSiteReservoirInfo); + + /** + * 新增水库站点基础信息 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 结果 + */ + public int insertGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo); + + /** + * 修改水库站点基础信息 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 结果 + */ + public int updateGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo); + + /** + * 删除水库站点基础信息 + * + * @param id 水库站点基础信息主键 + * @return 结果 + */ + public int deleteGSiteReservoirInfoById(Long id); + + /** + * 批量删除水库站点基础信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteGSiteReservoirInfoByIds(Long[] ids); +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GRiverInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteRiverInfoMapper.java similarity index 58% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GRiverInfoMapper.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteRiverInfoMapper.java index f91df24..c86ed74 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GRiverInfoMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteRiverInfoMapper.java @@ -1,7 +1,9 @@ package com.fastbee.ggroup.mapper; import java.util.List; -import com.fastbee.ggroup.domain.GRiverInfo; +import com.fastbee.ggroup.domain.GSiteRiverInfo; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * 河流基础信息Mapper接口 @@ -9,7 +11,8 @@ import com.fastbee.ggroup.domain.GRiverInfo; * @author kerwincui * @date 2024-10-22 */ -public interface GRiverInfoMapper +@Mapper +public interface GSiteRiverInfoMapper extends MPJBaseMapper { /** * 查询河流基础信息 @@ -17,31 +20,31 @@ public interface GRiverInfoMapper * @param id 河流基础信息主键 * @return 河流基础信息 */ - public GRiverInfo selectGRiverInfoById(Long id); + public GSiteRiverInfo selectGRiverInfoBySiteId(Long id); /** * 查询河流基础信息列表 * - * @param gRiverInfo 河流基础信息 + * @param gSiteRiverInfo 河流基础信息 * @return 河流基础信息集合 */ - public List selectGRiverInfoList(GRiverInfo gRiverInfo); + public List selectGRiverInfoList(GSiteRiverInfo gSiteRiverInfo); /** * 新增河流基础信息 * - * @param gRiverInfo 河流基础信息 + * @param gSiteRiverInfo 河流基础信息 * @return 结果 */ - public int insertGRiverInfo(GRiverInfo gRiverInfo); + public int insertGRiverInfo(GSiteRiverInfo gSiteRiverInfo); /** * 修改河流基础信息 * - * @param gRiverInfo 河流基础信息 + * @param gSiteRiverInfo 河流基础信息 * @return 结果 */ - public int updateGRiverInfo(GRiverInfo gRiverInfo); + public int updateGRiverInfo(GSiteRiverInfo gSiteRiverInfo); /** * 删除河流基础信息 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java similarity index 59% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteInfoService.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java index c91822b..8edc58b 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteMonitorInfoService.java @@ -1,7 +1,7 @@ package com.fastbee.ggroup.service; import java.util.List; -import com.fastbee.ggroup.domain.GSiteInfo; +import com.fastbee.ggroup.domain.GSiteMonitorInfo; /** * 站点基础信息Service接口 @@ -9,7 +9,7 @@ import com.fastbee.ggroup.domain.GSiteInfo; * @author kerwincui * @date 2024-10-10 */ -public interface IGSiteInfoService +public interface IGSiteMonitorInfoService { /** * 查询站点基础信息 @@ -17,31 +17,31 @@ public interface IGSiteInfoService * @param id 站点基础信息主键 * @return 站点基础信息 */ - GSiteInfo selectGSiteInfoById(Long id); + GSiteMonitorInfo selectGSiteInfoById(Long id); /** * 查询站点基础信息列表 * - * @param gSiteInfo 站点基础信息 + * @param gSiteMonitorInfo 站点基础信息 * @return 站点基础信息集合 */ - List selectGSiteInfoList(GSiteInfo gSiteInfo); + List selectGSiteInfoList(GSiteMonitorInfo gSiteMonitorInfo); /** * 新增站点基础信息 * - * @param gSiteInfo 站点基础信息 + * @param gSiteMonitorInfo 站点基础信息 * @return 结果 */ - int insertGSiteInfo(GSiteInfo gSiteInfo); + int insertGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo); /** * 修改站点基础信息 * - * @param gSiteInfo 站点基础信息 + * @param gSiteMonitorInfo 站点基础信息 * @return 结果 */ - int updateGSiteInfo(GSiteInfo gSiteInfo); + int updateGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo); /** * 批量删除站点基础信息 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 new file mode 100644 index 0000000..e983c8d --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java @@ -0,0 +1,61 @@ +package com.fastbee.ggroup.service; + +import java.util.List; +import com.fastbee.ggroup.domain.GSiteReservoirInfo; + +/** + * 水库站点基础信息Service接口 + * + * @author kerwincui + * @date 2024-10-23 + */ +public interface IGSiteReservoirInfoService +{ + /** + * 查询水库站点基础信息 + * + * @param id 水库站点基础信息主键 + * @return 水库站点基础信息 + */ + public GSiteReservoirInfo selectGSiteReservoirInfoById(Long id); + + /** + * 查询水库站点基础信息列表 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 水库站点基础信息集合 + */ + public List selectGSiteReservoirInfoList(GSiteReservoirInfo gSiteReservoirInfo); + + /** + * 新增水库站点基础信息 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 结果 + */ + public int insertGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo); + + /** + * 修改水库站点基础信息 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 结果 + */ + 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/IGRiverInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java similarity index 64% rename from fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGRiverInfoService.java rename to fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java index f06ba3d..a2ad313 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGRiverInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteRiverInfoService.java @@ -1,7 +1,7 @@ package com.fastbee.ggroup.service; import java.util.List; -import com.fastbee.ggroup.domain.GRiverInfo; +import com.fastbee.ggroup.domain.GSiteRiverInfo; /** * 河流基础信息Service接口 @@ -9,7 +9,7 @@ import com.fastbee.ggroup.domain.GRiverInfo; * @author kerwincui * @date 2024-10-22 */ -public interface IGRiverInfoService +public interface IGSiteRiverInfoService { /** * 查询河流基础信息 @@ -17,31 +17,31 @@ public interface IGRiverInfoService * @param id 河流基础信息主键 * @return 河流基础信息 */ - public GRiverInfo selectGRiverInfoById(Long id); + public GSiteRiverInfo selectGRiverInfoById(Long id); /** * 查询河流基础信息列表 * - * @param gRiverInfo 河流基础信息 + * @param gSiteRiverInfo 河流基础信息 * @return 河流基础信息集合 */ - public List selectGRiverInfoList(GRiverInfo gRiverInfo); + public List selectGRiverInfoList(GSiteRiverInfo gSiteRiverInfo); /** * 新增河流基础信息 * - * @param gRiverInfo 河流基础信息 + * @param gSiteRiverInfo 河流基础信息 * @return 结果 */ - public int insertGRiverInfo(GRiverInfo gRiverInfo); + public int insertGRiverInfo(GSiteRiverInfo gSiteRiverInfo); /** * 修改河流基础信息 * - * @param gRiverInfo 河流基础信息 + * @param gSiteRiverInfo 河流基础信息 * @return 结果 */ - public int updateGRiverInfo(GRiverInfo gRiverInfo); + public int updateGRiverInfo(GSiteRiverInfo gSiteRiverInfo); /** * 批量删除河流基础信息 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java index 14d88c9..fd33fd0 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java @@ -131,8 +131,8 @@ public class GGroupsServiceImpl implements IGGroupsService //根组列表 List roots = new ArrayList<>(); //所有站点列表 - List gGroupSiteAllList = selectGGroupsAllListSites(new GGroups()); + System.err.println("当前项目下所有站点："); gGroupSiteAllList.forEach(System.err::println); for (GGroups group : groupsList) { @@ -163,7 +163,6 @@ public class GGroupsServiceImpl implements IGGroupsService /** * 查询项目下全部站点 */ - public List selectGGroupsAllListSites(GGroups gGroups) { MPJLambdaWrapper gSiteGroupsMPJLambdaWrapper = new MPJLambdaWrapper() .select(GSiteGroups::getId, GSiteGroups::getParentId, GSiteGroups::getSiteId) diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java index da78742..23b439a 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.fastbee.common.exception.ServiceException; import com.fastbee.common.utils.DateUtils; +import com.fastbee.ggroup.enums.SiteTypeCategoryEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -78,6 +79,12 @@ public class GLegendServiceImpl implements IGLegendService if(!duplicateNameList.isEmpty()){ throw new ServiceException("图例名称重复!"); } + gLegend.setCategory(gLegend.getCategory().trim()); + //图例类别校验 + if(!SiteTypeCategoryEnum.contains(gLegend.getCategory())){ + throw new ServiceException("图例类别不存在!"); + } + gLegend.setCreateTime(DateUtils.getNowDate()); return gLegendMapper.insertGLegend(gLegend); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GRiverInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GRiverInfoServiceImpl.java deleted file mode 100644 index e1289e3..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GRiverInfoServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.fastbee.ggroup.service.impl; - -import java.util.List; -import com.fastbee.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fastbee.ggroup.mapper.GRiverInfoMapper; -import com.fastbee.ggroup.domain.GRiverInfo; -import com.fastbee.ggroup.service.IGRiverInfoService; - -/** - * 河流基础信息Service业务层处理 - * - * @author kerwincui - * @date 2024-10-22 - */ -@Service -public class GRiverInfoServiceImpl implements IGRiverInfoService -{ - @Autowired - private GRiverInfoMapper gRiverInfoMapper; - - /** - * 查询河流基础信息 - * - * @param id 河流基础信息主键 - * @return 河流基础信息 - */ - @Override - public GRiverInfo selectGRiverInfoById(Long id) - { - return gRiverInfoMapper.selectGRiverInfoById(id); - } - - /** - * 查询河流基础信息列表 - * - * @param gRiverInfo 河流基础信息 - * @return 河流基础信息 - */ - @Override - public List selectGRiverInfoList(GRiverInfo gRiverInfo) - { - return gRiverInfoMapper.selectGRiverInfoList(gRiverInfo); - } - - /** - * 新增河流基础信息 - * - * @param gRiverInfo 河流基础信息 - * @return 结果 - */ - @Override - public int insertGRiverInfo(GRiverInfo gRiverInfo) - { - gRiverInfo.setCreateTime(DateUtils.getNowDate()); - return gRiverInfoMapper.insertGRiverInfo(gRiverInfo); - } - - /** - * 修改河流基础信息 - * - * @param gRiverInfo 河流基础信息 - * @return 结果 - */ - @Override - public int updateGRiverInfo(GRiverInfo gRiverInfo) - { - gRiverInfo.setUpdateTime(DateUtils.getNowDate()); - return gRiverInfoMapper.updateGRiverInfo(gRiverInfo); - } - - /** - * 批量删除河流基础信息 - * - * @param ids 需要删除的河流基础信息主键 - * @return 结果 - */ - @Override - public int deleteGRiverInfoByIds(Long[] ids) - { - return gRiverInfoMapper.deleteGRiverInfoByIds(ids); - } - - /** - * 删除河流基础信息信息 - * - * @param id 河流基础信息主键 - * @return 结果 - */ - @Override - public int deleteGRiverInfoById(Long id) - { - return gRiverInfoMapper.deleteGRiverInfoById(id); - } -} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java deleted file mode 100644 index 409ea0f..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.fastbee.ggroup.service.impl; - -import java.util.List; -import java.util.Objects; - -import com.fastbee.common.exception.ServiceException; -import com.fastbee.common.utils.DateUtils; -import com.fastbee.common.utils.ValidationUtils; -import org.springframework.stereotype.Service; -import com.fastbee.ggroup.mapper.GSiteInfoMapper; -import com.fastbee.ggroup.domain.GSiteInfo; -import com.fastbee.ggroup.service.IGSiteInfoService; - -/** - * 站点基础信息Service业务层处理 - * - * @author kerwincui - * @date 2024-10-10 - */ -@Service -public class GSiteInfoServiceImpl implements IGSiteInfoService -{ - - private final GSiteInfoMapper gSiteInfoMapper; - - public GSiteInfoServiceImpl(GSiteInfoMapper gSiteInfoMapper) { - this.gSiteInfoMapper = gSiteInfoMapper; - } - - - /** - * 查询站点基础信息 - * - * @param id 站点基础信息主键 - * @return 站点基础信息 - */ - @Override - public GSiteInfo selectGSiteInfoById(Long id) - { - return gSiteInfoMapper.selectGSiteInfoById(id); - } - - /** - * 查询站点基础信息列表 - * - * @param gSiteInfo 站点基础信息 - * @return 站点基础信息 - */ - @Override - public List selectGSiteInfoList(GSiteInfo gSiteInfo) - { - return gSiteInfoMapper.selectGSiteInfoList(gSiteInfo); - } - - /** - * 新增站点基础信息 - * - * @param gSiteInfo 站点基础信息 - * @return 结果 - */ - @Override - public int insertGSiteInfo(GSiteInfo gSiteInfo) - { - gSiteInfo.setCreateTime(DateUtils.getNowDate()); - return gSiteInfoMapper.insertGSiteInfo(gSiteInfo); - } - - /** - * 修改站点基础信息 - * - * @param gSiteInfo 站点基础信息 - * @return 结果 - */ - @Override - public int updateGSiteInfo(GSiteInfo gSiteInfo) - { - //参数校验 - if(Objects.isNull(gSiteInfo.getSiteId())){ - throw new ServiceException("站点ID(siteId)字段不能为空！"); - } - if(!ValidationUtils.isMobile(gSiteInfo.getManagerPhone())){ - throw new ServiceException("站点管理员手机号(managerPhone)格式不正确！"); - } - //检查是否有该条数据 - if(Objects.isNull(gSiteInfoMapper.selectGSiteInfoById(gSiteInfo.getSiteId()))){ - //没有该条数据，则新增 - gSiteInfo.setCreateTime(DateUtils.getNowDate()); - return insertGSiteInfo(gSiteInfo); - } - gSiteInfo.setUpdateTime(DateUtils.getNowDate()); - return gSiteInfoMapper.updateGSiteInfo(gSiteInfo); - } - - /** - * 批量删除站点基础信息 - * - * @param ids 需要删除的站点基础信息主键 - * @return 结果 - */ - @Override - public int deleteGSiteInfoByIds(Long[] ids) - { - return gSiteInfoMapper.deleteGSiteInfoByIds(ids); - } - -} 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 new file mode 100644 index 0000000..0fc51db --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteMonitorInfoServiceImpl.java @@ -0,0 +1,106 @@ +package com.fastbee.ggroup.service.impl; + +import java.util.List; +import java.util.Objects; + +import com.fastbee.common.exception.ServiceException; +import com.fastbee.common.utils.DateUtils; +import com.fastbee.common.utils.ValidationUtils; +import org.springframework.stereotype.Service; +import com.fastbee.ggroup.mapper.GSiteMonitorInfoMapper; +import com.fastbee.ggroup.domain.GSiteMonitorInfo; +import com.fastbee.ggroup.service.IGSiteMonitorInfoService; + +/** + * 站点基础信息Service业务层处理 + * + * @author kerwincui + * @date 2024-10-10 + */ +@Service +public class GSiteMonitorInfoServiceImpl implements IGSiteMonitorInfoService +{ + + private final GSiteMonitorInfoMapper gSiteMonitorInfoMapper; + + public GSiteMonitorInfoServiceImpl(GSiteMonitorInfoMapper gSiteMonitorInfoMapper) { + this.gSiteMonitorInfoMapper = gSiteMonitorInfoMapper; + } + + + /** + * 查询站点基础信息 + * + * @param id 站点基础信息主键 + * @return 站点基础信息 + */ + @Override + public GSiteMonitorInfo selectGSiteInfoById(Long id) + { + 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); + } + + /** + * 修改站点基础信息 + * + * @param gSiteMonitorInfo 站点基础信息 + * @return 结果 + */ + @Override + public int updateGSiteInfo(GSiteMonitorInfo gSiteMonitorInfo) + { + //参数校验 + if(Objects.isNull(gSiteMonitorInfo.getSiteId())){ + throw new ServiceException("站点ID(siteId)字段不能为空！"); + } + if(!ValidationUtils.isMobile(gSiteMonitorInfo.getManagerPhone())){ + throw new ServiceException("站点管理员手机号(managerPhone)格式不正确！"); + } + //检查是否有该条数据 + if(Objects.isNull(gSiteMonitorInfoMapper.selectGSiteInfoBySiteId(gSiteMonitorInfo.getSiteId()))){ + //没有该条数据，则新增 + gSiteMonitorInfo.setCreateTime(DateUtils.getNowDate()); + return insertGSiteInfo(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/GSiteReservoirInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java new file mode 100644 index 0000000..df39413 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java @@ -0,0 +1,109 @@ +package com.fastbee.ggroup.service.impl; + +import java.util.List; +import java.util.Objects; + +import com.fastbee.common.exception.ServiceException; +import com.fastbee.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fastbee.ggroup.mapper.GSiteReservoirInfoMapper; +import com.fastbee.ggroup.domain.GSiteReservoirInfo; +import com.fastbee.ggroup.service.IGSiteReservoirInfoService; + +/** + * 水库站点基础信息Service业务层处理 + * + * @author kerwincui + * @date 2024-10-23 + */ +@Service +public class GSiteReservoirInfoServiceImpl implements IGSiteReservoirInfoService +{ + @Autowired + private GSiteReservoirInfoMapper gSiteReservoirInfoMapper; + + /** + * 查询水库站点基础信息 + * + * @param siteId 水库站点id + * @return 水库站点基础信息 + */ + @Override + public GSiteReservoirInfo selectGSiteReservoirInfoById(Long siteId) + { + return 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); + } + + /** + * 修改水库站点基础信息 + * + * @param gSiteReservoirInfo 水库站点基础信息 + * @return 结果 + */ + @Override + public int updateGSiteReservoirInfo(GSiteReservoirInfo gSiteReservoirInfo) + { + //必要参数校验 + if(Objects.isNull(gSiteReservoirInfo.getSiteId())){ + throw new ServiceException("站点ID(siteId)字段不能为空！"); + } + //检查是否有该条数据 + if(Objects.isNull(gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(gSiteReservoirInfo.getSiteId()))){ + //没有该条数据则新增 + gSiteReservoirInfo.setCreateTime(DateUtils.getNowDate()); + return insertGSiteReservoirInfo(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 new file mode 100644 index 0000000..97a8570 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteRiverInfoServiceImpl.java @@ -0,0 +1,111 @@ +package com.fastbee.ggroup.service.impl; + +import java.util.List; +import java.util.Objects; + +import com.fastbee.common.exception.ServiceException; +import com.fastbee.common.utils.DateUtils; +import org.springframework.stereotype.Service; +import com.fastbee.ggroup.mapper.GSiteRiverInfoMapper; +import com.fastbee.ggroup.domain.GSiteRiverInfo; +import com.fastbee.ggroup.service.IGSiteRiverInfoService; + +/** + * 河流基础信息Service业务层处理 + * + * @author kerwincui + * @date 2024-10-22 + */ +@Service +public class GSiteRiverInfoServiceImpl implements IGSiteRiverInfoService +{ + private final GSiteRiverInfoMapper gSiteRiverInfoMapper; + + public GSiteRiverInfoServiceImpl(GSiteRiverInfoMapper gSiteRiverInfoMapper) { + this.gSiteRiverInfoMapper = gSiteRiverInfoMapper; + } + + /** + * 查询河流基础信息 + * + * @param id 河流基础信息主键 + * @return 河流基础信息 + */ + @Override + public GSiteRiverInfo selectGRiverInfoById(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); + } + + /** + * 修改河流基础信息 + * + * @param gSiteRiverInfo 河流基础信息 + * @return 结果 + */ + @Override + public int updateGRiverInfo(GSiteRiverInfo gSiteRiverInfo) + { + //必要参数校验 + if(Objects.isNull(gSiteRiverInfo.getSiteId())){ + throw new ServiceException("站点ID(siteId)字段不能为空！"); + } + //检查是否有该条数据 + if(Objects.isNull(gSiteRiverInfoMapper.selectGRiverInfoBySiteId(gSiteRiverInfo.getSiteId()))){ + //没有该条数据则新增 + gSiteRiverInfo.setCreateTime(DateUtils.getNowDate()); + return insertGRiverInfo(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/GSitesServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java index 812c4ba..0890ac4 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 @@ -7,7 +7,9 @@ import java.util.stream.Collectors; import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONArray; import cn.hutool.json.JSONException; +import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; @@ -117,10 +119,29 @@ public class GSitesServiceImpl extends ServiceImplicon = #{icon}, tag = #{tag}, parent_id = #{parentId}, - project_id = #{projectId}, + project_name = #{projectName}, order_num = #{orderNum}, create_by = #{createBy}, diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteInfoMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteMonitorInfoMapper.xml similarity index 93% rename from fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteInfoMapper.xml rename to fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteMonitorInfoMapper.xml index 37000f5..c0a9fa5 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteInfoMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteMonitorInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -33,10 +33,10 @@ - select id, monitoring_station, pile_number, project_name, construction_year, equipment_brand, equipment_model, site_location, site_coordinates, longitude, latitude, protection_scope, protection_scope_remarks, fault_report, manager, manager_phone, pictures, code, remarks, del_flag, create_time, create_by, update_time, update_by, site_id from g_site_info + select id, monitoring_station, pile_number, project_name, construction_year, equipment_brand, equipment_model, site_location, site_coordinates, longitude, latitude, protection_scope, protection_scope_remarks, fault_report, manager, manager_phone, pictures, code, remarks, del_flag, create_time, create_by, update_time, update_by, site_id from g_site_monitor_info - and monitoring_station = #{monitoringStation} @@ -61,13 +61,13 @@ - where site_id = #{siteId} - - insert into g_site_info + + insert into g_site_monitor_info monitoring_station, pile_number, @@ -122,8 +122,8 @@ - - update g_site_info + + update g_site_monitor_info monitoring_station = #{monitoringStation}, pile_number = #{pileNumber}, @@ -154,11 +154,11 @@ - delete from g_site_info where id = #{id} + delete from g_site_monitor_info where id = #{id} - delete from g_site_info where id in + delete from g_site_monitor_info where id in #{id} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteReservoirInfoMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteReservoirInfoMapper.xml new file mode 100644 index 0000000..5c8771c --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteReservoirInfoMapper.xml @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, project_name, geo_coordinates, project_location, drainage_basin, drainage_system, river, town_village, reservoir_type, reservoir_function, construction_status, reservoir_level, main_dam_level, main_dam_height, main_dam_length, dam_crest_elevation, normal_storage_level, dead_water_level, total_capacity, beneficial_capacity, dead_storage, normal_storage_area, annual_supply_capacity, administrative_responsible, administrative_unit_name, administrative_position, administrative_phone, technical_responsible, technical_unit_name, technical_position, technical_phone, inspection_responsible, inspection_unit_name, inspection_position, inspection_phone, create_time, update_time, created_by, updated_by, del_flag, site_id from g_site_reservoir_info + + + + + + + + insert into g_site_reservoir_info + + project_name, + geo_coordinates, + project_location, + drainage_basin, + drainage_system, + river, + town_village, + reservoir_type, + reservoir_function, + construction_status, + reservoir_level, + main_dam_level, + main_dam_height, + main_dam_length, + dam_crest_elevation, + normal_storage_level, + dead_water_level, + total_capacity, + beneficial_capacity, + dead_storage, + normal_storage_area, + annual_supply_capacity, + administrative_responsible, + administrative_unit_name, + administrative_position, + administrative_phone, + technical_responsible, + technical_unit_name, + technical_position, + technical_phone, + inspection_responsible, + inspection_unit_name, + inspection_position, + inspection_phone, + create_time, + update_time, + created_by, + updated_by, + del_flag, + site_id, + + + #{projectName}, + #{geoCoordinates}, + #{projectLocation}, + #{drainageBasin}, + #{drainageSystem}, + #{river}, + #{townVillage}, + #{reservoirType}, + #{reservoirFunction}, + #{constructionStatus}, + #{reservoirLevel}, + #{mainDamLevel}, + #{mainDamHeight}, + #{mainDamLength}, + #{damCrestElevation}, + #{normalStorageLevel}, + #{deadWaterLevel}, + #{totalCapacity}, + #{beneficialCapacity}, + #{deadStorage}, + #{normalStorageArea}, + #{annualSupplyCapacity}, + #{administrativeResponsible}, + #{administrativeUnitName}, + #{administrativePosition}, + #{administrativePhone}, + #{technicalResponsible}, + #{technicalUnitName}, + #{technicalPosition}, + #{technicalPhone}, + #{inspectionResponsible}, + #{inspectionUnitName}, + #{inspectionPosition}, + #{inspectionPhone}, + #{createTime}, + #{updateTime}, + #{createdBy}, + #{updatedBy}, + #{delFlag}, + #{siteId}, + + + + + update g_site_reservoir_info + + project_name = #{projectName}, + geo_coordinates = #{geoCoordinates}, + project_location = #{projectLocation}, + drainage_basin = #{drainageBasin}, + drainage_system = #{drainageSystem}, + river = #{river}, + town_village = #{townVillage}, + reservoir_type = #{reservoirType}, + reservoir_function = #{reservoirFunction}, + construction_status = #{constructionStatus}, + reservoir_level = #{reservoirLevel}, + main_dam_level = #{mainDamLevel}, + main_dam_height = #{mainDamHeight}, + main_dam_length = #{mainDamLength}, + dam_crest_elevation = #{damCrestElevation}, + normal_storage_level = #{normalStorageLevel}, + dead_water_level = #{deadWaterLevel}, + total_capacity = #{totalCapacity}, + beneficial_capacity = #{beneficialCapacity}, + dead_storage = #{deadStorage}, + normal_storage_area = #{normalStorageArea}, + annual_supply_capacity = #{annualSupplyCapacity}, + administrative_responsible = #{administrativeResponsible}, + administrative_unit_name = #{administrativeUnitName}, + administrative_position = #{administrativePosition}, + administrative_phone = #{administrativePhone}, + technical_responsible = #{technicalResponsible}, + technical_unit_name = #{technicalUnitName}, + technical_position = #{technicalPosition}, + technical_phone = #{technicalPhone}, + inspection_responsible = #{inspectionResponsible}, + inspection_unit_name = #{inspectionUnitName}, + inspection_position = #{inspectionPosition}, + inspection_phone = #{inspectionPhone}, + create_time = #{createTime}, + update_time = #{updateTime}, + created_by = #{createdBy}, + updated_by = #{updatedBy}, + del_flag = #{delFlag}, + site_id = #{siteId}, + + where id = #{id} + + + + delete from g_site_reservoir_info where id = #{id} + + + + delete from g_site_reservoir_info where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GRiverInfoMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteRiverInfoMapper.xml similarity index 95% rename from fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GRiverInfoMapper.xml rename to fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteRiverInfoMapper.xml index bc9de9b..44025a4 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GRiverInfoMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteRiverInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -45,10 +45,10 @@ - select id, name, code, length, area, towns, start_latitude, start_longitude, start_location, end_latitude, end_longitude, end_location, pollution_drainage_number, water_related_projects_and_facilities_number, spanned_crossed_nearby_buildings_number, design_standard_recurrence_period, river_supervisor_name, river_supervisor_position, river_supervisor_phone, contact_unit, unit_contact_person_name, unit_contact_person_phone, contact_person_name, contact_person_phone, flood_prevention_materials, admin_person_name, admin_person_position, admin_person_phone, tech_person_name, tech_person_position, tech_person_phone, create_time, update_time, created_by, updated_by, del_flag, site_id from g_river_info + select id, name, code, length, area, towns, start_latitude, start_longitude, start_location, end_latitude, end_longitude, end_location, pollution_drainage_number, water_related_projects_and_facilities_number, spanned_crossed_nearby_buildings_number, design_standard_recurrence_period, river_supervisor_name, river_supervisor_position, river_supervisor_phone, contact_unit, unit_contact_person_name, unit_contact_person_phone, contact_person_name, contact_person_phone, flood_prevention_materials, admin_person_name, admin_person_position, admin_person_phone, tech_person_name, tech_person_position, tech_person_phone, create_time, update_time, created_by, updated_by, del_flag, site_id from g_site_river_info - and name like concat('%', #{name}, '%') @@ -87,13 +87,13 @@ - - where id = #{id} + where site_id = #{siteId} - - insert into g_river_info + + insert into g_site_river_info name, code, @@ -172,8 +172,8 @@ - - update g_river_info + + update g_site_river_info name = #{name}, code = #{code}, @@ -216,11 +216,11 @@ - delete from g_river_info where id = #{id} + delete from g_site_river_info where id = #{id} - delete from g_river_info where id in + delete from g_site_river_info where id in #{id} diff --git a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java index 7b31b00..373a1e8 100644 --- a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java +++ b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java @@ -21,7 +21,7 @@ public class Project extends BaseEntity private static final long serialVersionUID = 1L; /** 项目id */ - private Long projectId; + private Long id; /** 项目名称 */ @Excel(name = "项目名称") diff --git a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/IProjectService.java b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/IProjectService.java index 86e5d3e..d15d9fc 100644 --- a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/IProjectService.java +++ b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/IProjectService.java @@ -52,7 +52,7 @@ public interface IProjectService * @param projectIds 需要删除的项目主键集合 * @return 结果 */ - int deleteProjectByProjectIds(Long[] projectIds); + int deleteProjectByProjectIds(Long projectId); diff --git a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java index e115225..45e6e25 100644 --- a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java +++ b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.codec.Base64; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.fastbee.common.constant.ProjectLevelConstant; import com.fastbee.common.core.domain.entity.SysDept; +import com.fastbee.common.core.domain.entity.SysUser; import com.fastbee.common.exception.ServiceException; import com.fastbee.common.holder.ProjectHolder; import com.fastbee.common.utils.DateUtils; @@ -12,6 +13,7 @@ import com.fastbee.project.mapper.ProjectMapper; import com.fastbee.project.service.IProjectService; import com.fastbee.system.mapper.SysDeptMapper; +import com.fastbee.system.mapper.SysUserMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -28,13 +30,13 @@ public class ProjectServiceImpl implements IProjectService { private final ProjectMapper projectMapper; - - private final SysDeptMapper sysDeptMapper; + private final SysUserMapper sysUserMapper; - public ProjectServiceImpl(ProjectMapper projectMapper, SysDeptMapper sysDeptMapper) { + public ProjectServiceImpl(ProjectMapper projectMapper, SysDeptMapper sysDeptMapper, SysUserMapper sysUserMapper) { this.projectMapper = projectMapper; this.sysDeptMapper = sysDeptMapper; + this.sysUserMapper = sysUserMapper; } /** @@ -56,7 +58,7 @@ public class ProjectServiceImpl implements IProjectService public List selectProjectList(Project project) { return new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName, Project::getScope, + .select(Project::getId, Project::getProjectName, Project::getScope, Project::getAdministrativeArea, Project::getDeptId,Project::getAdministrativeAreaCode, Project::getLogo, Project::getImage, Project::getLevel, Project::getDeptName, Project::getCreateTime) @@ -71,7 +73,7 @@ public class ProjectServiceImpl implements IProjectService public int insertProject(Project project) { //判断选择的机构下是否已经绑定项目 List projectList = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName) + .select(Project::getId, Project::getProjectName) .eq(Project::getDeptId, project.getDeptId()).list(); if(!projectList.isEmpty()){ throw new ServiceException("该机构下已经存在项目"); @@ -82,15 +84,16 @@ public class ProjectServiceImpl implements IProjectService /** * 修改项目 - * @return 结果 */ @Override public int updateProject(Project project) { //判断选择的机构下是否已经绑定项目 Project one = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName,Project::getDeptId) - .eq(Project::getDeptId, project.getDeptId()).one(); + .select(Project::getId, Project::getProjectName,Project::getDeptId) + .eq(Project::getDeptId, project.getDeptId()) +// .ne(Project::getId,project.getId()) + .one(); if(Objects.isNull(one)){ throw new ServiceException("项目不存在！"); } @@ -102,12 +105,12 @@ public class ProjectServiceImpl implements IProjectService } /** - * 批量删除项目 + * 删除项目 */ @Override - public int deleteProjectByProjectIds(Long[] projectIds) + public int deleteProjectByProjectIds(Long projectId) { - return projectMapper.deleteProjectByProjectIds(projectIds); + return projectMapper.deleteById(projectId); } @@ -116,20 +119,27 @@ public class ProjectServiceImpl implements IProjectService */ @Override public Map selectProjectByUserId(Long userId) { + //查询用户所属机构 + SysUser sysUser = new LambdaQueryChainWrapper<>(sysUserMapper) + .select(SysUser::getUserId, SysUser::getDeptId) + .eq(SysUser::getUserId, userId) + .one(); + + //查询该管理员所管理的项目id以及子项目id列表 Project project = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName,Project::getLevel,Project::getDeptId) - .eq(Project::getOwnerId, userId) + .select(Project::getId, Project::getProjectName,Project::getLevel,Project::getDeptId) + .eq(Project::getDeptId, sysUser.getDeptId()) .one(); if(Objects.isNull(project)){ return null; } - List projects = getAllProjects(project.getProjectId()); + List projects = getAllProjects(project.getId()); //把列表进行Base64编码 String projectsBase64 = Base64.encode(projects.toString()); HashMap map = new HashMap<>(); map.put("projectIds",projectsBase64); - map.put("projectId",project.getProjectId()); + map.put("projectId",project.getId()); map.put("projectName", project.getProjectName()); map.put("projectLevel",project.getLevel().equals("市级")? ProjectLevelConstant.LEVEL_CITY :ProjectLevelConstant.LEVEL_COUNTY); return map; @@ -146,7 +156,7 @@ public class ProjectServiceImpl implements IProjectService .list(); //查询所有项目 List projectList = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getDeptId) + .select(Project::getId, Project::getDeptId) .list(); //遍历项目，把已绑定项目的机构从机构列表中移除 for (Project project : projectList) { @@ -167,7 +177,7 @@ public class ProjectServiceImpl implements IProjectService if(Objects.isNull(ProjectHolder.getProjectInfo().getProjectIdList())){ //查询所有一级项目列表 projectList = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName) + .select(Project::getId, Project::getProjectName) .isNull(Project::getParentId) .list(); } @@ -175,7 +185,7 @@ public class ProjectServiceImpl implements IProjectService else if(Objects.nonNull(ProjectHolder.getProjectInfo().getProjectIdList())){ //查询所有子一级项目列表 projectList = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName) + .select(Project::getId, Project::getProjectName) .in(!ProjectHolder.getProjectInfo().getProjectIdList().isEmpty(),Project::getParentId, ProjectHolder.getProjectInfo().getProjectIdList()) .list(); } @@ -187,22 +197,22 @@ public class ProjectServiceImpl implements IProjectService // 查询当前项目 Project currentProject = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName) - .eq(Project::getProjectId, projectId) + .select(Project::getId, Project::getProjectName) + .eq(Project::getId, projectId) .one(); if (currentProject != null) { - allProjects.add(currentProject.getProjectId()); + allProjects.add(currentProject.getId()); // 查询当前项目的子项目 List children = new LambdaQueryChainWrapper<>(projectMapper) - .select(Project::getProjectId, Project::getProjectName) + .select(Project::getId, Project::getProjectName) .eq(Project::getParentId, projectId) .list(); // 递归查询子项目 for (Project child : children) { - allProjects.addAll(getAllProjects(child.getProjectId())); + allProjects.addAll(getAllProjects(child.getId())); } } diff --git a/fastbee-service/fastbee-project-service/src/main/resources/mapper/project/ProjectMapper.xml b/fastbee-service/fastbee-project-service/src/main/resources/mapper/project/ProjectMapper.xml index 305b290..458f1bd 100644 --- a/fastbee-service/fastbee-project-service/src/main/resources/mapper/project/ProjectMapper.xml +++ b/fastbee-service/fastbee-project-service/src/main/resources/mapper/project/ProjectMapper.xml @@ -5,7 +5,7 @@ - + @@ -34,7 +34,7 @@ - select project_id, project_name, sys_show_name, central_coordinates, scope, administrative_area, owner, logo, image, video_introduction, remark, p_params, introduce, del_flag, create_time, create_by, update_time, remarks, tenant_id, tenant_name, owner_id, parent_id, dept_id, administrative_area_code, dept_name, level from project + select id, project_name, sys_show_name, central_coordinates, scope, administrative_area, owner, logo, image, video_introduction, remark, p_params, introduce, del_flag, create_time, create_by, update_time, remarks, tenant_id, tenant_name, owner_id, parent_id, dept_id, administrative_area_code, dept_name, level from project - where project_id = #{projectId} + where id = #{id} insert into project - project_id, + id, project_name, sys_show_name, central_coordinates, @@ -99,7 +99,7 @@ level, - #{projectId}, + #{id}, #{projectName}, #{sysShowName}, #{centralCoordinates}, @@ -157,17 +157,17 @@ dept_name = #{deptName}, level = #{level}, - where project_id = #{projectId} + where id = #{id} - delete from project where project_id = #{projectId} + delete from project where id = #{id} - delete from project where project_id in + delete from project where id in - #{projectId} + #{id} \ No newline at end of file diff --git a/fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysUserMapper.java b/fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysUserMapper.java index 62a4cca..b7fb948 100644 --- a/fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysUserMapper.java +++ b/fastbee-service/fastbee-system-service/src/main/java/com/fastbee/system/mapper/SysUserMapper.java @@ -1,6 +1,7 @@ package com.fastbee.system.mapper; import com.fastbee.common.core.domain.entity.SysUser; +import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface SysUserMapper +public interface SysUserMapper extends MPJBaseMapper { /** * 根据条件分页查询用户列表