From 66c1bd1e0daa1981905bbad1d01a9c6e2576882e Mon Sep 17 00:00:00 2001 From: zhumeixiao <3313492479@qq.com> Date: Mon, 4 Nov 2024 17:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E9=97=B8=E3=80=81=E7=81=8C=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E6=B3=B5=E7=AB=99=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gis/GSiteIrrigateInfoController.java | 110 +++++++++ .../gis/GSitePumpInfoController.java | 110 +++++++++ .../gis/GSiteSluiceInfoController.java | 16 +- .../ggroup/domain/GSiteIrrigateInfo.java | 147 ++++++++++++ .../fastbee/ggroup/domain/GSitePumpInfo.java | 177 ++++++++++++++ .../mapper/GSiteIrrigateInfoMapper.java | 63 +++++ .../ggroup/mapper/GSitePumpInfoMapper.java | 63 +++++ .../ggroup/mapper/GSiteSluiceInfoMapper.java | 10 +- .../service/IGSiteIrrigateInfoService.java | 61 +++++ .../ggroup/service/IGSitePumpInfoService.java | 61 +++++ .../service/IGSiteReservoirInfoService.java | 7 + .../service/IGSiteSluiceInfoService.java | 25 +- .../impl/GSiteIrrigateInfoServiceImpl.java | 109 +++++++++ .../impl/GSitePumpInfoServiceImpl.java | 106 +++++++++ .../impl/GSiteReservoirInfoServiceImpl.java | 10 + .../impl/GSiteSluiceInfoServiceImpl.java | 46 ++-- .../mapper/ggroup/GSiteIrrigateInfoMapper.xml | 188 +++++++++++++++ .../mapper/ggroup/GSitePumpInfoMapper.xml | 216 ++++++++++++++++++ .../mapper/ggroup/GSiteSluiceMapper.xml | 7 +- 19 files changed, 1504 insertions(+), 28 deletions(-) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteIrrigateInfo.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSitePumpInfo.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitePumpInfoMapper.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteIrrigateInfoMapper.xml create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitePumpInfoMapper.xml diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.java new file mode 100644 index 0000000..fca4def --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteIrrigateInfoController.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.GSiteIrrigateInfo; +import com.fastbee.ggroup.service.IGSiteIrrigateInfoService; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.common.core.page.TableDataInfo; + +/** + * 灌区基础信息Controller + * + * @author kerwincui + * @date 2024-11-04 + */ +@RestController +@RequestMapping("/gis/site/irrigated/info") +@Api(tags = "灌区基础信息") +public class GSiteIrrigateInfoController extends BaseController +{ + @Autowired + private IGSiteIrrigateInfoService gSiteIrrigateInfoService; + +/** + * 查询灌区基础信息列表 + */ +@PreAuthorize("@ss.hasPermi('ggroup:info:list')") +@GetMapping("/list") +@ApiOperation("查询灌区基础信息列表") + public TableDataInfo list(GSiteIrrigateInfo gSiteIrrigateInfo) + { + startPage(); + List list = gSiteIrrigateInfoService.selectGSiteIrrigateInfoList(gSiteIrrigateInfo); + return getDataTable(list); + } + + /** + * 导出灌区基础信息列表 + */ + @ApiOperation("导出灌区基础信息列表") + @PreAuthorize("@ss.hasPermi('ggroup:info:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, GSiteIrrigateInfo gSiteIrrigateInfo) + { + List list = gSiteIrrigateInfoService.selectGSiteIrrigateInfoList(gSiteIrrigateInfo); + ExcelUtil util = new ExcelUtil(GSiteIrrigateInfo.class); + util.exportExcel(response, list, "灌区基础信息数据"); + } + + /** + * 获取灌区基础信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:query')") + @GetMapping(value = "/{id}") + @ApiOperation("获取灌区基础信息详细信息") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(gSiteIrrigateInfoService.selectGSiteIrrigateInfoBySiteId(id)); + } + + /** + * 新增灌区基础信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:add')") + @PostMapping + @ApiOperation("新增灌区基础信息") + public AjaxResult add(@RequestBody GSiteIrrigateInfo gSiteIrrigateInfo) + { + return toAjax(gSiteIrrigateInfoService.insertGSiteIrrigateInfo(gSiteIrrigateInfo)); + } + + /** + * 修改灌区基础信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:edit')") + @PutMapping + @ApiOperation("修改灌区基础信息") + public AjaxResult edit(@RequestBody GSiteIrrigateInfo gSiteIrrigateInfo) + { + return toAjax(gSiteIrrigateInfoService.updateGSiteIrrigateInfo(gSiteIrrigateInfo)); + } + + /** + * 删除灌区基础信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:remove')") + @DeleteMapping("/{ids}") + @ApiOperation("删除灌区基础信息") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(gSiteIrrigateInfoService.deleteGSiteIrrigateInfoByIds(ids)); + } +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.java new file mode 100644 index 0000000..6da730e --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSitePumpInfoController.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.GSitePumpInfo; +import com.fastbee.ggroup.service.IGSitePumpInfoService; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.common.core.page.TableDataInfo; + +/** + * 泵站信息Controller + * + * @author kerwincui + * @date 2024-11-04 + */ +@RestController +@RequestMapping("/gis/site/pump/info") +@Api(tags = "泵站信息") +public class GSitePumpInfoController extends BaseController +{ + @Autowired + private IGSitePumpInfoService gSitePumpInfoService; + +/** + * 查询泵站信息列表 + */ +@PreAuthorize("@ss.hasPermi('ggroup:info:list')") +@GetMapping("/list") +@ApiOperation("查询泵站信息列表") + public TableDataInfo list(GSitePumpInfo gSitePumpInfo) + { + startPage(); + List list = gSitePumpInfoService.selectGSitePumpInfoList(gSitePumpInfo); + return getDataTable(list); + } + + /** + * 导出泵站信息列表 + */ + @ApiOperation("导出泵站信息列表") + @PreAuthorize("@ss.hasPermi('ggroup:info:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, GSitePumpInfo gSitePumpInfo) + { + List list = gSitePumpInfoService.selectGSitePumpInfoList(gSitePumpInfo); + ExcelUtil util = new ExcelUtil(GSitePumpInfo.class); + util.exportExcel(response, list, "泵站信息数据"); + } + + /** + * 获取泵站信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:query')") + @GetMapping(value = "/{id}") + @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)); + } + + /** + * 修改泵站信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:edit')") + @PutMapping + @ApiOperation("修改泵站信息") + public AjaxResult edit(@RequestBody GSitePumpInfo gSitePumpInfo) + { + return toAjax(gSitePumpInfoService.updateGSiteSluiceInfo(gSitePumpInfo)); + } + + /** + * 删除泵站信息 + */ + @PreAuthorize("@ss.hasPermi('ggroup:info:remove')") + @DeleteMapping("/{ids}") + @ApiOperation("删除泵站信息") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(gSitePumpInfoService.deleteGSitePumpInfoByIds(ids)); + } +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java index f58bd7a..efc3b5e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GSiteSluiceInfoController.java @@ -31,7 +31,7 @@ import com.fastbee.common.core.page.TableDataInfo; * @date 2024-10-31 */ @RestController -@RequestMapping("/ggroup/info") +@RequestMapping("/gis/site/sluice/info") @Api(tags = "水闸基本信息") public class GSiteSluiceInfoController extends BaseController { @@ -66,13 +66,20 @@ public class GSiteSluiceInfoController extends BaseController /** * 获取水闸基本信息详细信息 - */ + * @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)); } /** @@ -107,4 +114,9 @@ public class GSiteSluiceInfoController extends BaseController { return toAjax(gSiteSluiceInfoService.deleteGSiteSluiceInfoByIds(ids)); } + /** + * 更新水库的基本信息 + */ + + } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteIrrigateInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteIrrigateInfo.java new file mode 100644 index 0000000..99e32d2 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteIrrigateInfo.java @@ -0,0 +1,147 @@ +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_irrigate_info + * + * @author kerwincui + * @date 2024-11-04 + */ +@ApiModel(value = "GSiteIrrigateInfo",description = "灌区基础信息 g_site_irrigate_info") +@Data +@EqualsAndHashCode(callSuper = true) +public class GSiteIrrigateInfo extends BaseEntity +{ +private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 工程名称 */ + @Excel(name = "工程名称") + @ApiModelProperty("工程名称") + private String projectName; + + /** 工程编码 */ + @Excel(name = "工程编码") + @ApiModelProperty("工程编码") + private String projectCode; + + /** 规模 */ + @Excel(name = "规模") + @ApiModelProperty("规模") + private String scale; + + /** 工程位置 */ + @Excel(name = "工程位置") + @ApiModelProperty("工程位置") + private String location; + + /** 范围 */ + @Excel(name = "范围") + @ApiModelProperty("范围") + private String scope; + + /** 是否跨县 */ + @Excel(name = "是否跨县") + @ApiModelProperty("是否跨县") + private Integer crossCounty; + + /** 耕地面积 */ + @Excel(name = "耕地面积") + @ApiModelProperty("耕地面积") + private Long cultivatedLandarea; + + /** 设计灌溉面积 */ + @Excel(name = "设计灌溉面积") + @ApiModelProperty("设计灌溉面积") + private Long designedIrrigationArea; + + /** 灌溉面积(合计) */ + @Excel(name = "灌溉面积(合计)") + @ApiModelProperty("灌溉面积(合计)") + private Long totalIrrigationArea; + + /** 调整后的耕地面积（如果存在重复，请确认后删除一个） */ + @Excel(name = "调整后的耕地面积", readConverterExp = "如=果存在重复，请确认后删除一个") + @ApiModelProperty("调整后的耕地面积") + private Long adjustedCultivatedLandArea; + + /** 园林草地面积 */ + @Excel(name = "园林草地面积") + @ApiModelProperty("园林草地面积") + private Long gardenGrasslandArea; + + /** 管理单位名称 */ + @Excel(name = "管理单位名称") + @ApiModelProperty("管理单位名称") + private String managementUnitName; + + /** 管理类型 */ + @Excel(name = "管理类型") + @ApiModelProperty("管理类型") + private String managementType; + + /** 主要水源工程 */ + @Excel(name = "主要水源工程") + @ApiModelProperty("主要水源工程") + private String mainWaterSource; + + /** 补充水源工程 */ + @Excel(name = "补充水源工程") + @ApiModelProperty("补充水源工程") + private String supplementaryWaterSource; + + /** 用水户协会数量 */ + @Excel(name = "用水户协会数量") + @ApiModelProperty("用水户协会数量") + private Long waterUsersAssociation; + + /** 用水户协会管理面积 */ + @Excel(name = "用水户协会管理面积") + @ApiModelProperty("用水户协会管理面积") + private Long waterUsersAssociationArea; + + /** 专管人员数量 */ + @Excel(name = "专管人员数量") + @ApiModelProperty("专管人员数量") + private Long specializedStaff; + + /** 隶属关系 */ + @Excel(name = "隶属关系") + @ApiModelProperty("隶属关系") + private String subordination; + + /** 核定水价情况 */ + @Excel(name = "核定水价情况") + @ApiModelProperty("核定水价情况") + private Integer approvedWaterPrices; + + /** 核定水价 */ + @Excel(name = "核定水价") + @ApiModelProperty("核定水价") + private BigDecimal approvedWaterPrice; + + /** 执行水价 */ + @Excel(name = "执行水价") + @ApiModelProperty("执行水价") + private BigDecimal executedWaterPrice; + + /** 删除标志（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/GSitePumpInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSitePumpInfo.java new file mode 100644 index 0000000..0a3bf53 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSitePumpInfo.java @@ -0,0 +1,177 @@ +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_pump_info + * + * @author kerwincui + * @date 2024-11-04 + */ +@ApiModel(value = "GSitePumpInfo",description = "泵站信息 g_site_pump_info") +@Data +@EqualsAndHashCode(callSuper = true) +public class GSitePumpInfo extends BaseEntity +{ +private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 工程名称 */ + @Excel(name = "工程名称") + @ApiModelProperty("工程名称") + private String projectName; + + /** 工程编码 */ + @Excel(name = "工程编码") + @ApiModelProperty("工程编码") + private String projectCode; + + /** 地理坐标（经度） */ + @Excel(name = "地理坐标", readConverterExp = "经=度") + @ApiModelProperty("地理坐标") + private BigDecimal geographicalCoordLongitude; + + /** 地理坐标（纬度） */ + @Excel(name = "地理坐标", readConverterExp = "纬=度") + @ApiModelProperty("地理坐标") + private BigDecimal geographicalCoordLatitude; + + /** 工程位置 */ + @Excel(name = "工程位置") + @ApiModelProperty("工程位置") + private String location; + + /** 所在水资源三级区名称 */ + @Excel(name = "所在水资源三级区名称") + @ApiModelProperty("所在水资源三级区名称") + private String waterResourceArea; + + /** 所在河流 */ + @Excel(name = "所在河流") + @ApiModelProperty("所在河流") + private String riverName; + + /** 所在灌区 */ + @Excel(name = "所在灌区") + @ApiModelProperty("所在灌区") + private String irrigationArea; + + /** 泵站类型 */ + @Excel(name = "泵站类型") + @ApiModelProperty("泵站类型") + private String pumpStationType; + + /** 工程建设情况 */ + @Excel(name = "工程建设情况") + @ApiModelProperty("工程建设情况") + private String constructionStatus; + + /** 是否为枢纽工程 */ + @Excel(name = "是否为枢纽工程") + @ApiModelProperty("是否为枢纽工程") + private Integer isHubProject; + + /** 是否为闸站工程 */ + @Excel(name = "是否为闸站工程") + @ApiModelProperty("是否为闸站工程") + private Integer isGateStation; + + /** 是否为引泉工程 */ + @Excel(name = "是否为引泉工程") + @ApiModelProperty("是否为引泉工程") + private Integer isSpringProject; + + /** 工程等级 */ + @Excel(name = "工程等级") + @ApiModelProperty("工程等级") + private Long projectGrade; + + /** 主要建筑物等级 */ + @Excel(name = "主要建筑物等级") + @ApiModelProperty("主要建筑物等级") + private Long buildingGrade; + + /** 水泵数量 */ + @Excel(name = "水泵数量") + @ApiModelProperty("水泵数量") + private Long pumpCount; + + /** 设计扬程 */ + @Excel(name = "设计扬程") + @ApiModelProperty("设计扬程") + private BigDecimal designLift; + + /** 装机功率 */ + @Excel(name = "装机功率") + @ApiModelProperty("装机功率") + private Long installedPower; + + /** 装机流量 */ + @Excel(name = "装机流量") + @ApiModelProperty("装机流量") + private Long installedFlow; + + /** 工程任务 */ + @Excel(name = "工程任务") + @ApiModelProperty("工程任务") + private String task; + + /** 工程管理单位名称 */ + @Excel(name = "工程管理单位名称") + @ApiModelProperty("工程管理单位名称") + private String managementUnit; + + /** 权属 */ + @Excel(name = "权属") + @ApiModelProperty("权属") + private String ownership; + + /** 负责人 */ + @Excel(name = "负责人") + @ApiModelProperty("负责人") + private String responsiblePerson; + + /** 职位 */ + @Excel(name = "职位") + @ApiModelProperty("职位") + private String position; + + /** 电话 */ + @Excel(name = "电话") + @ApiModelProperty("电话") + private String phone; + + /** 是否完成划界 */ + @Excel(name = "是否完成划界") + @ApiModelProperty("是否完成划界") + private Integer isDemarcated; + + /** 是否完成确权 */ + @Excel(name = "是否完成确权") + @ApiModelProperty("是否完成确权") + private Integer isConfirmed; + + /** 防汛物资 */ + @Excel(name = "防汛物资") + @ApiModelProperty("防汛物资") + private String floodPrevention; + + /** 删除标志（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/mapper/GSiteIrrigateInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java new file mode 100644 index 0000000..ab1404e --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteIrrigateInfoMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.ggroup.mapper; + +import java.util.List; +import com.fastbee.ggroup.domain.GSiteIrrigateInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 灌区基础信息Mapper接口 + * + * @author kerwincui + * @date 2024-11-04 + */ +@Mapper +public interface GSiteIrrigateInfoMapper +{ + /** + * 查询灌区基础信息 + * + * @param SiteId 灌区基础信息主键 + * @return 灌区基础信息 + */ + public GSiteIrrigateInfo selectGSiteIrrigateInfoBySiteId(Long SiteId); + + /** + * 查询灌区基础信息列表 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 灌区基础信息集合 + */ + public List selectGSiteIrrigateInfoList(GSiteIrrigateInfo gSiteIrrigateInfo); + + /** + * 新增灌区基础信息 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 结果 + */ + public int insertGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo); + + /** + * 修改灌区基础信息 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 结果 + */ + public int updateGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo); + + /** + * 删除灌区基础信息 + * + * @param id 灌区基础信息主键 + * @return 结果 + */ + public int deleteGSiteIrrigateInfoById(Long id); + + /** + * 批量删除灌区基础信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteGSiteIrrigateInfoByIds(Long[] ids); +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitePumpInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitePumpInfoMapper.java new file mode 100644 index 0000000..b1627be --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSitePumpInfoMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.ggroup.mapper; + +import java.util.List; +import com.fastbee.ggroup.domain.GSitePumpInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 泵站信息Mapper接口 + * + * @author kerwincui + * @date 2024-11-04 + */ +@Mapper +public interface GSitePumpInfoMapper +{ + /** + * 查询泵站信息 + * + * @param SiteId 泵站信息主键 + * @return 泵站信息 + */ + public GSitePumpInfo selectGSitePumpInfoBySiteId(Long SiteId); + + /** + * 查询泵站信息列表 + * + * @param gSitePumpInfo 泵站信息 + * @return 泵站信息集合 + */ + public List selectGSitePumpInfoList(GSitePumpInfo gSitePumpInfo); + + /** + * 新增泵站信息 + * + * @param gSitePumpInfo 泵站信息 + * @return 结果 + */ + public int insertGSitePumpInfo(GSitePumpInfo gSitePumpInfo); + + /** + * 修改泵站信息 + * + * @param gSitePumpInfo 泵站信息 + * @return 结果 + */ + public int updateGSitePumpInfo(GSitePumpInfo gSitePumpInfo); + + /** + * 删除泵站信息 + * + * @param id 泵站信息主键 + * @return 结果 + */ + public int deleteGSitePumpInfoById(Long id); + + /** + * 批量删除泵站信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteGSitePumpInfoByIds(Long[] ids); +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java index 7e9ba8b..15d4127 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GSiteSluiceInfoMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.ggroup.domain.GSiteSluiceInfo; +import org.apache.ibatis.annotations.Mapper; /** * 水闸基本信息Mapper接口 @@ -11,6 +12,7 @@ import com.fastbee.ggroup.domain.GSiteSluiceInfo; * @author kerwincui * @date 2024-10-31 */ +@Mapper public interface GSiteSluiceInfoMapper extends BaseMapper { /** @@ -20,7 +22,13 @@ public interface GSiteSluiceInfoMapper extends BaseMapper * @return 水闸基本信息 */ public GSiteSluiceInfo selectGSiteSluiceInfoById(Long id); - + /** + * 根据siteId查询水闸基本信息 + * + * @param siteId 水闸基本信息主键 + * @return 水闸基本信息 + */ + public List selectGSiteSluiceInfoBySiteId(Long siteId); /** * 查询水闸基本信息列表 * diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java new file mode 100644 index 0000000..eb49015 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteIrrigateInfoService.java @@ -0,0 +1,61 @@ +package com.fastbee.ggroup.service; + +import java.util.List; +import com.fastbee.ggroup.domain.GSiteIrrigateInfo; + +/** + * 灌区基础信息Service接口 + * + * @author kerwincui + * @date 2024-11-04 + */ +public interface IGSiteIrrigateInfoService +{ + /** + * 查询灌区基础信息 + * + * @param SiteId 灌区基础信息外键 + * @return 灌区基础信息 + */ + public GSiteIrrigateInfo selectGSiteIrrigateInfoBySiteId(Long SiteId); + + /** + * 修改灌区站点基础信息 + * @param gSiteIrrigateInfo 灌区站点基础信息 + * @return 结果 + */ + public int updateGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo); + /** + * 查询灌区基础信息列表 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 灌区基础信息集合 + */ + public List selectGSiteIrrigateInfoList(GSiteIrrigateInfo gSiteIrrigateInfo); + + /** + * 新增灌区基础信息 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 结果 + */ + public int insertGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo); + + + + /** + * 批量删除灌区基础信息 + * + * @param ids 需要删除的灌区基础信息主键集合 + * @return 结果 + */ + public int deleteGSiteIrrigateInfoByIds(Long[] ids); + + /** + * 删除灌区基础信息信息 + * + * @param id 灌区基础信息主键 + * @return 结果 + */ + public int deleteGSiteIrrigateInfoById(Long id); +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java new file mode 100644 index 0000000..4cbd078 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSitePumpInfoService.java @@ -0,0 +1,61 @@ +package com.fastbee.ggroup.service; + +import java.util.List; +import com.fastbee.ggroup.domain.GSitePumpInfo; + +/** + * 泵站信息Service接口 + * + * @author kerwincui + * @date 2024-11-04 + */ +public interface IGSitePumpInfoService +{ + /** + * 查询泵站信息 + * + * @param SiteId 泵站信息主键 + * @return 泵站信息 + */ + public GSitePumpInfo selectGSitePumpInfoBySiteId(Long SiteId); + + /** + * 查询泵站信息列表 + * + * @param gSitePumpInfo 泵站信息 + * @return 泵站信息集合 + */ + public List selectGSitePumpInfoList(GSitePumpInfo gSitePumpInfo); + + /** + * 新增泵站信息 + * + * @param gSitePumpInfo 泵站信息 + * @return 结果 + */ + public int insertGSitePumpInfo(GSitePumpInfo gSitePumpInfo); + + /** + * 修改泵站信息 + * + * @param gSitePumpInfo 泵站信息 + * @return 结果 + */ + public int updateGSiteSluiceInfo(GSitePumpInfo gSitePumpInfo); + + /** + * 批量删除泵站信息 + * + * @param ids 需要删除的泵站信息主键集合 + * @return 结果 + */ + public int deleteGSitePumpInfoByIds(Long[] ids); + + /** + * 删除泵站信息信息 + * + * @param id 泵站信息主键 + * @return 结果 + */ + public int deleteGSitePumpInfoById(Long id); +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java index e983c8d..b6682cd 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteReservoirInfoService.java @@ -19,6 +19,13 @@ public interface IGSiteReservoirInfoService */ public GSiteReservoirInfo selectGSiteReservoirInfoById(Long id); + /** + * 根据站点的id查询水闸的站点信息 + * @param siteId 水闸站点的id + * @return 水闸站点的信息 + */ + + public List selectGSiteReservoirInfoBySiteId(Long siteId); /** * 查询水库站点基础信息列表 * diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java index 6ec6fb6..3e0f648 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteSluiceInfoService.java @@ -1,6 +1,8 @@ package com.fastbee.ggroup.service; import java.util.List; + +import com.fastbee.ggroup.domain.GSiteReservoirInfo; import com.fastbee.ggroup.domain.GSiteSluiceInfo; /** @@ -18,7 +20,13 @@ public interface IGSiteSluiceInfoService * @return 水闸基本信息 */ public GSiteSluiceInfo selectGSiteSluiceInfoById(Long id); - + /** + * 根据siteId查询水闸基本信息 + * + * @param siteId 水闸基本信息外键 + * @return 水闸基本信息 + */ + public List selectGSiteSluiceInfoBySiteId(Long siteId); /** * 查询水闸基本信息列表 * @@ -35,14 +43,6 @@ public interface IGSiteSluiceInfoService */ public int insertGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo); - /** - * 修改水闸基本信息 - * - * @param gSiteSluiceInfo 水闸基本信息 - * @return 结果 - */ - public int updateGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo); - /** * 批量删除水闸基本信息 * @@ -58,4 +58,11 @@ public interface IGSiteSluiceInfoService * @return 结果 */ public int deleteGSiteSluiceInfoById(Long id); + + /** + * + * @param gSiteSluiceInfo 修改水闸的基本信息 + * @return + */ + public int updateGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.java new file mode 100644 index 0000000..13df561 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteIrrigateInfoServiceImpl.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 com.fastbee.ggroup.domain.GSiteReservoirInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fastbee.ggroup.mapper.GSiteIrrigateInfoMapper; +import com.fastbee.ggroup.domain.GSiteIrrigateInfo; +import com.fastbee.ggroup.service.IGSiteIrrigateInfoService; + +/** + * 灌区基础信息Service业务层处理 + * + * @author kerwincui + * @date 2024-11-04 + */ +@Service +public class GSiteIrrigateInfoServiceImpl implements IGSiteIrrigateInfoService +{ + @Autowired + private GSiteIrrigateInfoMapper gSiteIrrigateInfoMapper; + + /** + * 查询灌区基础信息 + * + * @param SiteId 灌区基础信息外键 + * @return 灌区基础信息 + */ + @Override + public GSiteIrrigateInfo selectGSiteIrrigateInfoBySiteId(Long SiteId) + { + return gSiteIrrigateInfoMapper.selectGSiteIrrigateInfoBySiteId(SiteId); + } + /** + * 修改灌区站点基础信息 + * @param gSiteIrrigateInfo 灌区站点基础信息 + * @return 结果 + */ + @Override + public int updateGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo) + { + //必要参数校验 + if(Objects.isNull(gSiteIrrigateInfo.getSiteId())){ + throw new ServiceException("站点ID(siteId)字段不能为空！"); + } + //检查是否有该条数据 + if(Objects.isNull(gSiteIrrigateInfoMapper.selectGSiteIrrigateInfoBySiteId(gSiteIrrigateInfo.getSiteId()))){ + //没有该条数据则新增 + gSiteIrrigateInfo.setCreateTime(DateUtils.getNowDate()); + return insertGSiteIrrigateInfo(gSiteIrrigateInfo); + } + gSiteIrrigateInfo.setUpdateTime(DateUtils.getNowDate()); + return gSiteIrrigateInfoMapper.updateGSiteIrrigateInfo(gSiteIrrigateInfo); + } + /** + * 查询灌区基础信息列表 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 灌区基础信息 + */ + @Override + public List selectGSiteIrrigateInfoList(GSiteIrrigateInfo gSiteIrrigateInfo) + { + return gSiteIrrigateInfoMapper.selectGSiteIrrigateInfoList(gSiteIrrigateInfo); + } + + /** + * 新增灌区基础信息 + * + * @param gSiteIrrigateInfo 灌区基础信息 + * @return 结果 + */ + @Override + public int insertGSiteIrrigateInfo(GSiteIrrigateInfo gSiteIrrigateInfo) + { + gSiteIrrigateInfo.setCreateTime(DateUtils.getNowDate()); + return gSiteIrrigateInfoMapper.insertGSiteIrrigateInfo(gSiteIrrigateInfo); + } + + + + /** + * 批量删除灌区基础信息 + * + * @param ids 需要删除的灌区基础信息主键 + * @return 结果 + */ + @Override + public int deleteGSiteIrrigateInfoByIds(Long[] ids) + { + return gSiteIrrigateInfoMapper.deleteGSiteIrrigateInfoByIds(ids); + } + + /** + * 删除灌区基础信息信息 + * + * @param id 灌区基础信息主键 + * @return 结果 + */ + @Override + public int deleteGSiteIrrigateInfoById(Long id) + { + return gSiteIrrigateInfoMapper.deleteGSiteIrrigateInfoById(id); + } +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.java new file mode 100644 index 0000000..7d6688e --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitePumpInfoServiceImpl.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.ggroup.domain.GSiteSluiceInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fastbee.ggroup.mapper.GSitePumpInfoMapper; +import com.fastbee.ggroup.domain.GSitePumpInfo; +import com.fastbee.ggroup.service.IGSitePumpInfoService; + +/** + * 泵站信息Service业务层处理 + * + * @author kerwincui + * @date 2024-11-04 + */ +@Service +public class GSitePumpInfoServiceImpl implements IGSitePumpInfoService +{ + @Autowired + private GSitePumpInfoMapper gSitePumpInfoMapper; + + /** + * 查询泵站信息 + * + * @param SiteId 泵站信息主键 + * @return 泵站信息 + */ + @Override + public GSitePumpInfo selectGSitePumpInfoBySiteId(Long SiteId) + { + return gSitePumpInfoMapper.selectGSitePumpInfoBySiteId(SiteId); + } + + /** + * 查询泵站信息列表 + * + * @param gSitePumpInfo 泵站信息 + * @return 泵站信息 + */ + @Override + public List selectGSitePumpInfoList(GSitePumpInfo gSitePumpInfo) + { + return gSitePumpInfoMapper.selectGSitePumpInfoList(gSitePumpInfo); + } + + /** + * 新增泵站信息 + * + * @param gSitePumpInfo 泵站信息 + * @return 结果 + */ + @Override + public int insertGSitePumpInfo(GSitePumpInfo gSitePumpInfo) + { + gSitePumpInfo.setCreateTime(DateUtils.getNowDate()); + return gSitePumpInfoMapper.insertGSitePumpInfo(gSitePumpInfo); + } + + /** + * 修改泵站信息 + * + * @param gSitePumpInfo 泵站信息 + * @return 结果 + */ + @Override + public int updateGSiteSluiceInfo(GSitePumpInfo gSitePumpInfo){ + if (Objects.isNull(gSitePumpInfo.getSiteId())){ + throw new ServiceException("站点ID(siteId)字段不能为空！"); + } + if (Objects.isNull(gSitePumpInfoMapper.selectGSitePumpInfoBySiteId(gSitePumpInfo.getSiteId()))){ + gSitePumpInfo.setCreateTime(DateUtils.getNowDate()); + return gSitePumpInfoMapper.insertGSitePumpInfo(gSitePumpInfo); + } + gSitePumpInfo.setUpdateTime(DateUtils.getNowDate()); + return gSitePumpInfoMapper.updateGSitePumpInfo(gSitePumpInfo); + } + + /** + * 批量删除泵站信息 + * + * @param ids 需要删除的泵站信息主键 + * @return 结果 + */ + @Override + public int deleteGSitePumpInfoByIds(Long[] ids) + { + return gSitePumpInfoMapper.deleteGSitePumpInfoByIds(ids); + } + + /** + * 删除泵站信息信息 + * + * @param id 泵站信息主键 + * @return 结果 + */ + @Override + public int deleteGSitePumpInfoById(Long id) + { + return gSitePumpInfoMapper.deleteGSitePumpInfoById(id); + } +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java index df39413..2c2c5ad 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteReservoirInfoServiceImpl.java @@ -35,6 +35,16 @@ public class GSiteReservoirInfoServiceImpl implements IGSiteReservoirInfoService return gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(siteId); } + /** + * 根据站点的id查询水闸的站点信息 + * @param siteId 水闸站点的id + * @return 水闸站点的信息 + */ + + public List selectGSiteReservoirInfoBySiteId(Long siteId){ + return (List) gSiteReservoirInfoMapper.selectGSiteReservoirInfoBySiteId(siteId); + } + /** * 查询水库站点基础信息列表 * diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java index ae72d62..fb6d1fa 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteSluiceInfoServiceImpl.java @@ -1,6 +1,9 @@ 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.ggroup.mapper.GSiteSluiceInfoMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +34,17 @@ public class GSiteSluiceInfoServiceImpl implements IGSiteSluiceInfoService { return gSiteSluiceInfoMapper.selectGSiteSluiceInfoById(id); } + /** + * 根据站点的id查询水闸的站点信息 + * + * @param siteId 水闸站点的id + * @return 水闸站点的信息 + */ + @Override + public List selectGSiteSluiceInfoBySiteId(Long siteId) + { + return gSiteSluiceInfoMapper.selectGSiteSluiceInfoBySiteId(siteId); + } /** * 查询水闸基本信息列表 @@ -56,20 +70,6 @@ public class GSiteSluiceInfoServiceImpl implements IGSiteSluiceInfoService gSiteSluiceInfo.setCreateTime(DateUtils.getNowDate()); return gSiteSluiceInfoMapper.insertGSiteSluiceInfo(gSiteSluiceInfo); } - - /** - * 修改水闸基本信息 - * - * @param gSiteSluiceInfo 水闸基本信息 - * @return 结果 - */ - @Override - public int updateGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo) - { - gSiteSluiceInfo.setUpdateTime(DateUtils.getNowDate()); - return gSiteSluiceInfoMapper.updateGSiteSluiceInfo(gSiteSluiceInfo); - } - /** * 批量删除水闸基本信息 * @@ -93,4 +93,22 @@ public class GSiteSluiceInfoServiceImpl implements IGSiteSluiceInfoService { return gSiteSluiceInfoMapper.deleteGSiteSluiceInfoById(id); } + /** + * + * @param gSiteSluiceInfo 修改水闸的基本信息 + * @return + */ + @Override + public int updateGSiteSluiceInfo(GSiteSluiceInfo gSiteSluiceInfo){ + if (Objects.isNull(gSiteSluiceInfo.getSiteId())){ + throw new ServiceException("站点ID(siteId)字段不能为空！"); + } + if (Objects.isNull(gSiteSluiceInfoMapper.selectGSiteSluiceInfoById(gSiteSluiceInfo.getId()))){ + gSiteSluiceInfo.setCreateTime(DateUtils.getNowDate()); + return gSiteSluiceInfoMapper.insertGSiteSluiceInfo(gSiteSluiceInfo); + } + gSiteSluiceInfo.setUpdateTime(DateUtils.getNowDate()); + return gSiteSluiceInfoMapper.updateGSiteSluiceInfo(gSiteSluiceInfo); + } + } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteIrrigateInfoMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteIrrigateInfoMapper.xml new file mode 100644 index 0000000..7ae1003 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteIrrigateInfoMapper.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, project_name, project_code, scale, location, scope, cross_county, cultivated_landArea, designed_irrigation_area, total_irrigation_area, adjusted_cultivated_land_area, garden_grassland_area, management_unit_name, management_type, main_water_source, supplementary_water_source, water_users_association, water_users_association_area, specialized_staff, subordination, approved_water_prices, approved_water_price, executed_water_price, del_flag, create_time, create_by, update_time, update_by, site_id from g_site_irrigate_info + + + + + + + + insert into g_site_irrigate_info + + id, + project_name, + project_code, + scale, + location, + scope, + cross_county, + cultivated_landArea, + designed_irrigation_area, + total_irrigation_area, + adjusted_cultivated_land_area, + garden_grassland_area, + management_unit_name, + management_type, + main_water_source, + supplementary_water_source, + water_users_association, + water_users_association_area, + specialized_staff, + subordination, + approved_water_prices, + approved_water_price, + executed_water_price, + del_flag, + create_time, + create_by, + update_time, + update_by, + site_id, + + + #{id}, + #{projectName}, + #{projectCode}, + #{scale}, + #{location}, + #{scope}, + #{crossCounty}, + #{cultivatedLandarea}, + #{designedIrrigationArea}, + #{totalIrrigationArea}, + #{adjustedCultivatedLandArea}, + #{gardenGrasslandArea}, + #{managementUnitName}, + #{managementType}, + #{mainWaterSource}, + #{supplementaryWaterSource}, + #{waterUsersAssociation}, + #{waterUsersAssociationArea}, + #{specializedStaff}, + #{subordination}, + #{approvedWaterPrices}, + #{approvedWaterPrice}, + #{executedWaterPrice}, + #{delFlag}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{siteId}, + + + + + update g_site_irrigate_info + + project_name = #{projectName}, + project_code = #{projectCode}, + scale = #{scale}, + location = #{location}, + scope = #{scope}, + cross_county = #{crossCounty}, + cultivated_landArea = #{cultivatedLandarea}, + designed_irrigation_area = #{designedIrrigationArea}, + total_irrigation_area = #{totalIrrigationArea}, + adjusted_cultivated_land_area = #{adjustedCultivatedLandArea}, + garden_grassland_area = #{gardenGrasslandArea}, + management_unit_name = #{managementUnitName}, + management_type = #{managementType}, + main_water_source = #{mainWaterSource}, + supplementary_water_source = #{supplementaryWaterSource}, + water_users_association = #{waterUsersAssociation}, + water_users_association_area = #{waterUsersAssociationArea}, + specialized_staff = #{specializedStaff}, + subordination = #{subordination}, + approved_water_prices = #{approvedWaterPrices}, + approved_water_price = #{approvedWaterPrice}, + executed_water_price = #{executedWaterPrice}, + del_flag = #{delFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + site_id = #{siteId}, + + where id = #{id} + + + + delete from g_site_irrigate_info where id = #{id} + + + + delete from g_site_irrigate_info where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitePumpInfoMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitePumpInfoMapper.xml new file mode 100644 index 0000000..6465364 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSitePumpInfoMapper.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, project_name, project_code, geographical_coord_longitude, geographical_coord_latitude, location, water_resource_area, river_name, irrigation_area, pump_station_type, construction_status, is_hub_project, is_gate_station, is_spring_project, project_grade, building_grade, pump_count, design_lift, installed_power, installed_flow, task, management_unit, ownership, responsible_person, position, phone, is_demarcated, is_confirmed, flood_prevention, del_flag, create_time, create_by, update_time, update_by, site_id from g_site_pump_info + + + + + + + + insert into g_site_pump_info + + project_name, + project_code, + geographical_coord_longitude, + geographical_coord_latitude, + location, + water_resource_area, + river_name, + irrigation_area, + pump_station_type, + construction_status, + is_hub_project, + is_gate_station, + is_spring_project, + project_grade, + building_grade, + pump_count, + design_lift, + installed_power, + installed_flow, + task, + management_unit, + ownership, + responsible_person, + position, + phone, + is_demarcated, + is_confirmed, + flood_prevention, + del_flag, + create_time, + create_by, + update_time, + update_by, + site_id, + + + #{projectName}, + #{projectCode}, + #{geographicalCoordLongitude}, + #{geographicalCoordLatitude}, + #{location}, + #{waterResourceArea}, + #{riverName}, + #{irrigationArea}, + #{pumpStationType}, + #{constructionStatus}, + #{isHubProject}, + #{isGateStation}, + #{isSpringProject}, + #{projectGrade}, + #{buildingGrade}, + #{pumpCount}, + #{designLift}, + #{installedPower}, + #{installedFlow}, + #{task}, + #{managementUnit}, + #{ownership}, + #{responsiblePerson}, + #{position}, + #{phone}, + #{isDemarcated}, + #{isConfirmed}, + #{floodPrevention}, + #{delFlag}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{siteId}, + + + + + update g_site_pump_info + + project_name = #{projectName}, + project_code = #{projectCode}, + geographical_coord_longitude = #{geographicalCoordLongitude}, + geographical_coord_latitude = #{geographicalCoordLatitude}, + location = #{location}, + water_resource_area = #{waterResourceArea}, + river_name = #{riverName}, + irrigation_area = #{irrigationArea}, + pump_station_type = #{pumpStationType}, + construction_status = #{constructionStatus}, + is_hub_project = #{isHubProject}, + is_gate_station = #{isGateStation}, + is_spring_project = #{isSpringProject}, + project_grade = #{projectGrade}, + building_grade = #{buildingGrade}, + pump_count = #{pumpCount}, + design_lift = #{designLift}, + installed_power = #{installedPower}, + installed_flow = #{installedFlow}, + task = #{task}, + management_unit = #{managementUnit}, + ownership = #{ownership}, + responsible_person = #{responsiblePerson}, + position = #{position}, + phone = #{phone}, + is_demarcated = #{isDemarcated}, + is_confirmed = #{isConfirmed}, + flood_prevention = #{floodPrevention}, + del_flag = #{delFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + site_id = #{siteId}, + + where id = #{id} + + + + delete from g_site_pump_info where id = #{id} + + + + delete from g_site_pump_info where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteSluiceMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteSluiceMapper.xml index e32d880..f0fee14 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteSluiceMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GSiteSluiceMapper.xml @@ -2,7 +2,7 @@ - + @@ -97,7 +97,10 @@ where id = #{id} - + insert into g_site_sluice_info