From 7878a9853595507ac586bc8f8477d63f53821d7e Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 13 Mar 2025 21:34:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuili/common/core/domain/BaseEntity.java | 2 + .../controller/BsSgcResQqhjController.java | 110 ++++++++++++++++ .../res/domain/AttReservoirLimitExamine.java | 6 + .../com/kms/yg/res/domain/BsSgcResQqhj.java | 117 ++++++++++++++++++ .../kms/yg/res/mapper/BsSgcResQqhjMapper.java | 29 +++++ .../yg/res/service/BsSgcResQqhjService.java | 50 ++++++++ .../mapper/system/SysConfigMapper.xml | 5 +- .../mapper/system/SysDictDataMapper.xml | 8 +- .../mapper/system/SysDictTypeMapper.xml | 8 +- .../mapper/yg/df/BsSgcDfAqrwMapper.xml | 2 +- .../mapper/yg/res/BsSgcResQqhjMapper.xml | 42 +++++++ .../mapper/yg/sz/BsSgcSzAqrwMapper.xml | 2 +- 12 files changed, 367 insertions(+), 14 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResQqhjController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResQqhj.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResQqhjMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResQqhjService.java create mode 100644 shuili-system/src/main/resources/mapper/yg/res/BsSgcResQqhjMapper.xml diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java index 0641fe21..883d7207 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java @@ -49,6 +49,8 @@ public class BaseEntity implements Serializable @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") protected Date updateTime; + + @TableField(exist = false) /** 备注 */ @Excel(name = "备注,可以不填") protected String remark; diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResQqhjController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResQqhjController.java new file mode 100644 index 00000000..99f5cda6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResQqhjController.java @@ -0,0 +1,110 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResQqhj; +import com.kms.yg.res.service.BsSgcResQqhjService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** + * 水闸确权划界Controller + * + * @author kms + * @date 2024-01-16 + */ +@RestController +@RequestMapping("/res/qqhj") +@Api(tags = "水闸确权划界") +public class BsSgcResQqhjController extends BaseController +{ + @Autowired + private BsSgcResQqhjService bsSgcResQqhjService; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + + /** + * 查询水闸确权划界列表 + */ + @PostMapping("/list") + @ApiOperation("水闸确权划界列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcResQqhjService.selectPage(sp); + } + + /** + * 导出水闸确权划界列表 + */ + @Log(title = "水闸确权划界导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸确权划界导出") + public AjaxResult export(@RequestBody BsSgcResQqhj bsSgcResQqhj) + { + List list = bsSgcResQqhjService.listByIds(bsSgcResQqhj.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResQqhj.class); + return util.exportExcel(list, "qqhj"); + } + + /** + * 获取水闸确权划界详细信息 + */ + @ApiOperation(" 水闸确权划界详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcResQqhjService.getById(id)); + } + + /** + * 新增水闸确权划界 + */ + @Log(title = "水闸确权划界新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸确权划界新增") + public AjaxResult add(@RequestBody BsSgcResQqhj bsSgcResQqhj) + { + BaseEntityUtils.preInsert(bsSgcResQqhj); + return toAjax(bsSgcResQqhjService.save(bsSgcResQqhj)); + } + + /** + * 修改水闸确权划界 + */ + @ApiOperation("水闸确权划界修改") + @Log(title = "水闸确权划界修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResQqhj bsSgcResQqhj) + { + return toAjax(bsSgcResQqhjService.updateById(bsSgcResQqhj)); + } + + /** + * 删除水闸确权划界 + */ + @ApiOperation("水闸确权划界删除") + @Log(title = "水闸确权划界删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcResQqhjService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/AttReservoirLimitExamine.java b/shuili-system/src/main/java/com/kms/yg/res/domain/AttReservoirLimitExamine.java index bd6758b4..875e9c06 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/domain/AttReservoirLimitExamine.java +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/AttReservoirLimitExamine.java @@ -74,4 +74,10 @@ public class AttReservoirLimitExamine extends BaseEntity @ApiModelProperty("降低运行水位意见") private String owerDept; + @ApiModelProperty("审核状态") + private String examineStatus; + + @ApiModelProperty("审核意见") + private String auditOpintion; + } diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResQqhj.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResQqhj.java new file mode 100644 index 00000000..8fa4e93d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResQqhj.java @@ -0,0 +1,117 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 水闸确权划界对象 bs_sgc_df_qqhj + * + * @author kms + * @date 2024-01-16 + */ +@TableName("bs_sgc_df_qqhj_v2") +@Data +@ApiModel("水闸确权划界") +public class BsSgcResQqhj extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + + + @TableField(exist = false) + private String engScal; + + /** 工程功能 */ + @Excel(name = "工程功能") + @ApiModelProperty("工程功能") + private String engineeringFunctions; + + /** 土地用途 */ + @Excel(name = "土地用途") + @ApiModelProperty("土地用途") + private String landUse; + + /** 限制条件 */ + @Excel(name = "限制条件") + @ApiModelProperty("限制条件") + private String limitations; + + /** 产权所有者 */ + @Excel(name = "产权所有者") + @ApiModelProperty("产权所有者") + private String propertyOwner; + + /** 所有者权力 + +及义务 */ + @Excel(name = "所有者权力及义务") + @ApiModelProperty("所有者权力及义务") + private String ownerRights; + + /** 有效期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("有效期") + private Date periodValidity; + + /** 产权证书 */ + @Excel(name = "产权证书") + @ApiModelProperty("产权证书") + private String certificateTitle; + + /** 管理范围 */ + @Excel(name = "管理范围") + @ApiModelProperty("管理范围") + private String managementScope; + + /** 保护范围 */ + @Excel(name = "保护范围") + @ApiModelProperty("保护范围") + private String protectScope; + + /** $column.columnComment */ + @Excel(name = "保护范围") + @ApiModelProperty("保护范围") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "保护范围") + @ApiModelProperty("保护范围") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "保护范围") + @ApiModelProperty("保护范围") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "保护范围") + @ApiModelProperty("保护范围") + private String relation; + + @TableField(exist = false) + private String resName; + @TableField(exist = false) + private String resType; + + private String resCode; + + @TableField(exist = false) + private String adcd; + + private String pointLatitudeLongitudeList; + private String lineLatitudeLongitudeList; + private String allLatitudeLongitudeList; + private String pointLatitudeLongitudeListV2; + private String lineLatitudeLongitudeListV2; + private String allLatitudeLongitudeListV2; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResQqhjMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResQqhjMapper.java new file mode 100644 index 00000000..17527032 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResQqhjMapper.java @@ -0,0 +1,29 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfQqhj; +import com.kms.yg.res.domain.BsSgcResQqhj; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 水闸确权划界Mapper接口 + * + * @author kms + * @date 2024-01-16 + */ +@Repository +public interface BsSgcResQqhjMapper extends BaseMapper { + + List getList(@Param("id") String id, + @Param("resName") String resName, + @Param("resType") String resType, + @Param("resCode") String resCode, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResQqhjService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResQqhjService.java new file mode 100644 index 00000000..bc110719 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResQqhjService.java @@ -0,0 +1,50 @@ +package com.kms.yg.res.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfQqhj; +import com.kms.yg.df.mapper.BsSgcDfQqhjMapper; +import com.kms.yg.res.domain.BsSgcResQqhj; +import com.kms.yg.res.mapper.BsSgcResQqhjMapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 水闸确权划界Service接口 + * + * @author kms + * @date 2024-01-16 + */ +@Service +public class BsSgcResQqhjService extends BaseService { + + @Autowired + private BsSgcResQqhjMapper bsSgcResQqhjMapper; + + @Autowired + private SysXzqhService sysXzqhService; + + public IPage selectPage(SearchParam sp) { + + BsSgcResQqhj data = sp.getData(); + + Map params = sp.getParams(); + + + List list = bsSgcResQqhjMapper.getList(data.getId(),data.getResName(),data.getResType(),data.getResCode(), + sysXzqhService.getSubString(data.getAdcd()),(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); + + Page page = new Page<>(); + + page.setRecords(list); + page.setTotal(list.size()); + + return page; + } +} diff --git a/shuili-system/src/main/resources/mapper/system/SysConfigMapper.xml b/shuili-system/src/main/resources/mapper/system/SysConfigMapper.xml index 08db9aca..981a1466 100644 --- a/shuili-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, config_name, config_key, config_value, config_type, create_uid, create_time, update_uid, update_time, remark + select id, config_name, config_key, config_value, config_type, create_uid, create_time, update_uid, update_time from sys_config @@ -71,7 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" config_value, config_type, create_uid, - remark, create_time )values( #{configName}, @@ -79,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{configValue}, #{configType}, #{createUid}, - #{remark}, sysdate() ) @@ -92,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" config_value = #{configValue}, config_type = #{configType}, update_uid = #{updateUid}, - remark = #{remark}, update_time = sysdate() where id = #{id} diff --git a/shuili-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/shuili-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 7043e901..1b48bad4 100644 --- a/shuili-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, remark + select id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time from sys_dict_data @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" list_class = #{listClass}, is_default = #{isDefault}, status = #{status}, - remark = #{remark}, + update_uid = #{updateUid}, update_time = sysdate() @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" list_class, is_default, status, - remark, + create_uid, create_time, update_time @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{listClass}, #{isDefault}, #{status}, - #{remark}, + #{createUid}, sysdate(), sysdate() diff --git a/shuili-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/shuili-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 3c8e8085..7d2c56c9 100644 --- a/shuili-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dict_name, dict_type, status, create_uid, create_time, remark + select id, dict_name, dict_type, status, create_uid, create_time from sys_dict_type @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_name = #{dictName}, dict_type = #{dictType}, status = #{status}, - remark = #{remark}, + update_uid = #{updateUid}, update_time = sysdate() @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_name, dict_type, status, - remark, + create_uid, create_time )values( @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{dictName}, #{dictType}, #{status}, - #{remark}, + #{createUid}, sysdate() ) diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml index 830f6284..672d738c 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml @@ -139,7 +139,7 @@ AND sj.create_time >= #{startDate} - AND sj.create_time <= #{endDate} + AND sj.create_time > #{endDate} diff --git a/shuili-system/src/main/resources/mapper/yg/res/BsSgcResQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/res/BsSgcResQqhjMapper.xml new file mode 100644 index 00000000..9113ccfb --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/res/BsSgcResQqhjMapper.xml @@ -0,0 +1,42 @@ + + + + + + select sj.RES_NAME, + sj.RES_CODE, + sj.RES_TYPE, + sq.* + from bs_sgc_df_qqhj_v2 sq + left join att_res_base sj on sq.res_code = sj.RES_CODE + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index a1918ca2..19fef113 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -140,7 +140,7 @@ AND sj.create_time >= #{startDate} - AND sj.create_time <= #{endDate} + AND sj.create_time > #{endDate} From 33fe9c97757e7313e308399af73884a97a8fe31d Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 13 Mar 2025 21:53:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml | 2 +- .../src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml index 672d738c..3c1476fe 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml @@ -139,7 +139,7 @@ AND sj.create_time >= #{startDate} - AND sj.create_time > #{endDate} + AND sj.create_time < #{endDate} diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index 19fef113..aa1b0161 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -140,7 +140,7 @@ AND sj.create_time >= #{startDate} - AND sj.create_time > #{endDate} + AND sj.create_time < #{endDate} From 76963a22b60d21cd170e13930cf5fc9f761ba8aa Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Fri, 14 Mar 2025 05:14:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ttEmbankmentDangerKnowledgeController.java | 115 ++++++++++++ .../domain/AttEmbankmentDangerKnowledge.java | 48 +++++ .../AttEmbankmentDangerKnowledgeMapper.java | 16 ++ .../AttEmbankmentDangerKnowledgeService.java | 16 ++ .../AttResDangerKnowledgeController.java | 115 ++++++++++++ .../controller/BBsSgcResFxzzcyController.java | 123 +++++++++++++ .../controller/BsSgcResBydyzbController.java | 111 ++++++++++++ .../controller/BsSgcResBzbpController.java | 164 ++++++++++++++++++ .../controller/BsSgcResFxwzController.java | 131 ++++++++++++++ .../controller/BsSgcResFxzzController.java | 148 ++++++++++++++++ .../controller/BsSgcResJfglController.java | 112 ++++++++++++ .../controller/BsSgcResYaxxController.java | 111 ++++++++++++ .../controller/BsSgcResYhxxController.java | 115 ++++++++++++ .../yg/res/domain/AttResDangerKnowledge.java | 48 +++++ .../com/kms/yg/res/domain/BsSgcResBydyzb.java | 59 +++++++ .../com/kms/yg/res/domain/BsSgcResBzbp.java | 106 +++++++++++ .../com/kms/yg/res/domain/BsSgcResFxwz.java | 94 ++++++++++ .../com/kms/yg/res/domain/BsSgcResFxzz.java | 96 ++++++++++ .../kms/yg/res/domain/BsSgcResFxzzDto.java | 17 ++ .../com/kms/yg/res/domain/BsSgcResFxzzcy.java | 64 +++++++ .../com/kms/yg/res/domain/BsSgcResJfgl.java | 87 ++++++++++ .../com/kms/yg/res/domain/BsSgcResYaxx.java | 98 +++++++++++ .../com/kms/yg/res/domain/BsSgcResYhxx.java | 124 +++++++++++++ .../mapper/AttResDangerKnowledgeMapper.java | 16 ++ .../yg/res/mapper/BsSgcResBydyzbMapper.java | 17 ++ .../kms/yg/res/mapper/BsSgcResBzbpMapper.java | 21 +++ .../kms/yg/res/mapper/BsSgcResFxwzMapper.java | 17 ++ .../kms/yg/res/mapper/BsSgcResFxzzMapper.java | 18 ++ .../yg/res/mapper/BsSgcResFxzzcyMapper.java | 17 ++ .../kms/yg/res/mapper/BsSgcResJfglMapper.java | 29 ++++ .../kms/yg/res/mapper/BsSgcResYaxxMapper.java | 17 ++ .../kms/yg/res/mapper/BsSgcResYhxxMapper.java | 22 +++ .../service/AttResDangerKnowledgeService.java | 16 ++ .../yg/res/service/BsSgcResBydyzbService.java | 19 ++ .../yg/res/service/BsSgcResBzbpService.java | 65 +++++++ .../yg/res/service/BsSgcResFxwzService.java | 19 ++ .../yg/res/service/BsSgcResFxzzService.java | 19 ++ .../yg/res/service/BsSgcResFxzzcyService.java | 19 ++ .../yg/res/service/BsSgcResJfglService.java | 59 +++++++ .../yg/res/service/BsSgcResYaxxService.java | 19 ++ .../yg/res/service/BsSgcResYhxxService.java | 28 +++ .../mapper/yg/df/BsSgcDfAqrwMapper.xml | 2 +- .../mapper/yg/df/BsSgcDfJfglMapper.xml | 3 +- .../mapper/yg/res/BsSgcResBzbpMapper.xml | 38 ++++ .../mapper/yg/res/BsSgcResJfglMapper.xml | 42 +++++ .../mapper/yg/sz/BsSgcSzAqrwMapper.xml | 2 +- .../mapper/yg/sz/BsSgcSzJfglMapper.xml | 5 +- 47 files changed, 2642 insertions(+), 5 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/AttEmbankmentDangerKnowledgeController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/AttEmbankmentDangerKnowledge.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/mapper/AttEmbankmentDangerKnowledgeMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/AttEmbankmentDangerKnowledgeService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/AttResDangerKnowledgeController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BBsSgcResFxzzcyController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBzbpController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxwzController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResJfglController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYaxxController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYhxxController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/AttResDangerKnowledge.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBzbp.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxwz.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzz.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzcy.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResJfgl.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYaxx.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYhxx.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/AttResDangerKnowledgeMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBydyzbMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBzbpMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxwzMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzcyMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResJfglMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYaxxMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYhxxMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/AttResDangerKnowledgeService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBydyzbService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBzbpService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxwzService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzcyService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResJfglService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYaxxService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYhxxService.java create mode 100644 shuili-system/src/main/resources/mapper/yg/res/BsSgcResBzbpMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/res/BsSgcResJfglMapper.xml diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/AttEmbankmentDangerKnowledgeController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/AttEmbankmentDangerKnowledgeController.java new file mode 100644 index 00000000..91d1245f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/AttEmbankmentDangerKnowledgeController.java @@ -0,0 +1,115 @@ +package com.kms.yg.df.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; +import com.kms.yg.df.domain.AttEmbankmentDangerKnowledge; +import com.kms.yg.df.service.AttEmbankmentDangerKnowledgeService; + + +/** + * 堤围工程隐患处置知识库Controller + * + * @author kms + * @date 2025-03-14 + */ +@RestController +@RequestMapping("/df/knowledge") +@Api(tags = "堤围工程隐患处置知识库") +public class AttEmbankmentDangerKnowledgeController extends BaseController +{ + @Autowired + private AttEmbankmentDangerKnowledgeService attEmbankmentDangerKnowledgeService; + + + /** + * 查询堤围工程隐患处置知识库列表 + */ + @PostMapping("/list") + @ApiOperation("堤围工程隐患处置知识库列表") + public IPage list(@RequestBody SearchParam sp) + { + return attEmbankmentDangerKnowledgeService.selectPage(sp); + } + + /** + * 导出堤围工程隐患处置知识库列表 + */ + @Log(title = "堤围工程隐患处置知识库导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤围工程隐患处置知识库导出") + public AjaxResult export(@RequestBody AttEmbankmentDangerKnowledge attEmbankmentDangerKnowledge) + { + List list = attEmbankmentDangerKnowledgeService.listByIds(attEmbankmentDangerKnowledge.getIds()); + ExcelUtil util = new ExcelUtil<>(AttEmbankmentDangerKnowledge.class); + return util.exportExcel(list, "knowledge"); + } + + /** + * 获取堤围工程隐患处置知识库详细信息 + */ + @ApiOperation(" 堤围工程隐患处置知识库详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attEmbankmentDangerKnowledgeService.getById(id)); + } + + /** + * 新增堤围工程隐患处置知识库 + */ + @Log(title = "堤围工程隐患处置知识库新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤围工程隐患处置知识库新增") + public AjaxResult add(@RequestBody AttEmbankmentDangerKnowledge attEmbankmentDangerKnowledge) + { + BaseEntityUtils.preInsert(attEmbankmentDangerKnowledge); + return toAjax(attEmbankmentDangerKnowledgeService.save(attEmbankmentDangerKnowledge)); + } + + /** + * 修改堤围工程隐患处置知识库 + */ + @ApiOperation("堤围工程隐患处置知识库修改") + @Log(title = "堤围工程隐患处置知识库修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttEmbankmentDangerKnowledge attEmbankmentDangerKnowledge) + { + return toAjax(attEmbankmentDangerKnowledgeService.updateById(attEmbankmentDangerKnowledge)); + } + + /** + * 删除堤围工程隐患处置知识库 + */ + @ApiOperation("堤围工程隐患处置知识库删除") + @Log(title = "堤围工程隐患处置知识库删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attEmbankmentDangerKnowledgeService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/AttEmbankmentDangerKnowledge.java b/shuili-system/src/main/java/com/kms/yg/df/domain/AttEmbankmentDangerKnowledge.java new file mode 100644 index 00000000..31714078 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/AttEmbankmentDangerKnowledge.java @@ -0,0 +1,48 @@ +package com.kms.yg.df.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤围工程隐患处置知识库对象 att_embankment_danger_knowledge + * + * @author kms + * @date 2025-03-14 + */ +@TableName("att_embankment_danger_knowledge") +@Data +@ApiModel("堤围工程隐患处置知识库") +public class AttEmbankmentDangerKnowledge extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String name; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String keyword; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String file; + + /** $column.columnComment */ + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @ApiModelProperty("${comment}") + private String updateUid; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/AttEmbankmentDangerKnowledgeMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/AttEmbankmentDangerKnowledgeMapper.java new file mode 100644 index 00000000..34983f93 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/AttEmbankmentDangerKnowledgeMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.AttEmbankmentDangerKnowledge; + +/** + * 堤围工程隐患处置知识库Mapper接口 + * + * @author kms + * @date 2025-03-14 + */ +@Repository +public interface AttEmbankmentDangerKnowledgeMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/AttEmbankmentDangerKnowledgeService.java b/shuili-system/src/main/java/com/kms/yg/df/service/AttEmbankmentDangerKnowledgeService.java new file mode 100644 index 00000000..13221ac3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/service/AttEmbankmentDangerKnowledgeService.java @@ -0,0 +1,16 @@ +package com.kms.yg.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yg.df.mapper.AttEmbankmentDangerKnowledgeMapper; +import com.kms.yg.df.domain.AttEmbankmentDangerKnowledge; +import org.springframework.stereotype.Service; +/** + * 堤围工程隐患处置知识库Service接口 + * + * @author kms + * @date 2025-03-14 + */ +@Service +public class AttEmbankmentDangerKnowledgeService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/AttResDangerKnowledgeController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/AttResDangerKnowledgeController.java new file mode 100644 index 00000000..cede7b14 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/AttResDangerKnowledgeController.java @@ -0,0 +1,115 @@ +package com.kms.yg.res.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; +import com.kms.yg.res.domain.AttResDangerKnowledge; +import com.kms.yg.res.service.AttResDangerKnowledgeService; + + +/** + * 水库隐患处置知识库Controller + * + * @author kms + * @date 2025-03-14 + */ +@RestController +@RequestMapping("/res/knowledge") +@Api(tags = "水库隐患处置知识库") +public class AttResDangerKnowledgeController extends BaseController +{ + @Autowired + private AttResDangerKnowledgeService attResDangerKnowledgeService; + + + /** + * 查询水库隐患处置知识库列表 + */ + @PostMapping("/list") + @ApiOperation("水库隐患处置知识库列表") + public IPage list(@RequestBody SearchParam sp) + { + return attResDangerKnowledgeService.selectPage(sp); + } + + /** + * 导出水库隐患处置知识库列表 + */ + @Log(title = "水库隐患处置知识库导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水库隐患处置知识库导出") + public AjaxResult export(@RequestBody AttResDangerKnowledge attResDangerKnowledge) + { + List list = attResDangerKnowledgeService.listByIds(attResDangerKnowledge.getIds()); + ExcelUtil util = new ExcelUtil<>(AttResDangerKnowledge.class); + return util.exportExcel(list, "knowledge"); + } + + /** + * 获取水库隐患处置知识库详细信息 + */ + @ApiOperation(" 水库隐患处置知识库详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attResDangerKnowledgeService.getById(id)); + } + + /** + * 新增水库隐患处置知识库 + */ + @Log(title = "水库隐患处置知识库新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水库隐患处置知识库新增") + public AjaxResult add(@RequestBody AttResDangerKnowledge attResDangerKnowledge) + { + BaseEntityUtils.preInsert(attResDangerKnowledge); + return toAjax(attResDangerKnowledgeService.save(attResDangerKnowledge)); + } + + /** + * 修改水库隐患处置知识库 + */ + @ApiOperation("水库隐患处置知识库修改") + @Log(title = "水库隐患处置知识库修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttResDangerKnowledge attResDangerKnowledge) + { + return toAjax(attResDangerKnowledgeService.updateById(attResDangerKnowledge)); + } + + /** + * 删除水库隐患处置知识库 + */ + @ApiOperation("水库隐患处置知识库删除") + @Log(title = "水库隐患处置知识库删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attResDangerKnowledgeService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BBsSgcResFxzzcyController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BBsSgcResFxzzcyController.java new file mode 100644 index 00000000..8c014a83 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BBsSgcResFxzzcyController.java @@ -0,0 +1,123 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.res.domain.BsSgcResFxzzcy; +import com.kms.yg.res.service.BsSgcResFxzzcyService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + + +/** + * 水闸防汛组织成员Controller + * + * @author kms + * @date 2024-01-17 + */ +@RestController +@RequestMapping("/res/fxzzcy") +@Api(tags = "水闸防汛组织成员") +public class BBsSgcResFxzzcyController extends BaseController +{ + @Autowired + private BsSgcResFxzzcyService bsSgcSzFxzzcyService; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + + /** + * 查询水闸防汛组织成员列表 + */ + @PostMapping("/list") + @ApiOperation("水闸防汛组织成员列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzFxzzcyService.selectPage(sp); + } + + /** + * 导出水闸防汛组织成员列表 + */ + @Log(title = "水闸防汛组织成员导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸防汛组织成员导出") + public AjaxResult export(@RequestBody BsSgcResFxzzcy bsSgcSzFxzzcy) + { + List list = bsSgcSzFxzzcyService.listByIds(bsSgcSzFxzzcy.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResFxzzcy.class); + return util.exportExcel(list, "fxzzcy"); + } + + /** + * 获取水闸防汛组织成员详细信息 + */ + @ApiOperation(" 水闸防汛组织成员详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzFxzzcyService.getById(id)); + } + + /** + * 新增水闸防汛组织成员 + */ + @Log(title = "水闸防汛组织成员新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸防汛组织成员新增") + public AjaxResult add(@RequestBody BsSgcResFxzzcy bsSgcSzFxzzcy) + { + BaseEntityUtils.preInsert(bsSgcSzFxzzcy); + return toAjax(bsSgcSzFxzzcyService.save(bsSgcSzFxzzcy)); + } + + @PostMapping("/saveBatch") + public AjaxResult saveBatch(@RequestBody List list) { + for (BsSgcResFxzzcy bsSgcSzFxzzcy : list) { + BaseEntityUtils.preInsert(bsSgcSzFxzzcy); + } + return toAjax(bsSgcSzFxzzcyService.saveBatch(list)); + } + + /** + * 修改水闸防汛组织成员 + */ + @ApiOperation("水闸防汛组织成员修改") + @Log(title = "水闸防汛组织成员修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResFxzzcy bsSgcSzFxzzcy) + { + return toAjax(bsSgcSzFxzzcyService.updateById(bsSgcSzFxzzcy)); + } + + @PutMapping("/editBatch") + public AjaxResult editBatch(@RequestBody List list) { + return toAjax(bsSgcSzFxzzcyService.saveOrUpdateBatch(list)); + } + + /** + * 删除水闸防汛组织成员 + */ + @ApiOperation("水闸防汛组织成员删除") + @Log(title = "水闸防汛组织成员删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzFxzzcyService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java new file mode 100644 index 00000000..5f438e3f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java @@ -0,0 +1,111 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResBydyzb; +import com.kms.yg.res.service.BsSgcResBydyzbService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + + +/** + * 水闸备用电源主Controller + * + * @author kms + * @date 2024-01-17 + */ +@RestController +@RequestMapping("/res/bydyzb") +@Api(tags = "水闸备用电源主") +public class BsSgcResBydyzbController extends BaseController +{ + @Autowired + private BsSgcResBydyzbService bsSgcSzBydyzbService; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + + /** + * 查询水闸备用电源主列表 + */ + @PostMapping("/list") + @ApiOperation("水闸备用电源主列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzBydyzbService.selectPage(sp); + } + + /** + * 导出水闸备用电源主列表 + */ + @Log(title = "水闸备用电源主导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸备用电源主导出") + public AjaxResult export(@RequestBody BsSgcResBydyzb bsSgcSzBydyzb) + { + List list = bsSgcSzBydyzbService.listByIds(bsSgcSzBydyzb.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResBydyzb.class); + return util.exportExcel(list, "bydyzb"); + } + + /** + * 获取水闸备用电源主详细信息 + */ + @ApiOperation(" 水闸备用电源主详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzBydyzbService.getById(id)); + } + + /** + * 新增水闸备用电源主 + */ + @Log(title = "水闸备用电源主新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸备用电源主新增") + public AjaxResult add(@RequestBody BsSgcResBydyzb bsSgcSzBydyzb) + { + BaseEntityUtils.preInsert(bsSgcSzBydyzb); + return toAjax(bsSgcSzBydyzbService.save(bsSgcSzBydyzb)); + } + + /** + * 修改水闸备用电源主 + */ + @ApiOperation("水闸备用电源主修改") + @Log(title = "水闸备用电源主修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResBydyzb bsSgcSzBydyzb) + { + return toAjax(bsSgcSzBydyzbService.updateById(bsSgcSzBydyzb)); + } + + /** + * 删除水闸备用电源主 + */ + @ApiOperation("水闸备用电源主删除") + @Log(title = "水闸备用电源主删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzBydyzbService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBzbpController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBzbpController.java new file mode 100644 index 00000000..fc0bb257 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBzbpController.java @@ -0,0 +1,164 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.common.utils.UserUtils; +import com.kms.system.domain.SysXzqh; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResBzbp; +import com.kms.yg.res.service.BsSgcResBzbpService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + + +/** + * 堤防标识标牌Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/res/dikeMark") +@Api(tags = "堤防标识标牌") +public class BsSgcResBzbpController extends BaseController +{ + @Autowired + private BsSgcResBzbpService bsSgcResBzbpService; + + //测试 + @Autowired + private SysDeptService sysDeptService; + + + /** + * 查询堤防标识标牌列表 + */ + @PostMapping("/list") + @ApiOperation("堤防标识标牌列表") + public IPage list(@RequestBody SearchParam sp) + { + + BsSgcResBzbp projectInfo = sp.getData(); + return bsSgcResBzbpService.selectPage(sp,null); + +// return BsSgcResBzbpService.selectPage(sp); + } + + /** + * 导出堤防标识标牌列表 + */ + @Log(title = "堤防标识标牌导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤防标识标牌导出") + public AjaxResult export(@RequestBody BsSgcResBzbp BsSgcResBzbp) + { + List list = bsSgcResBzbpService.listByIds(BsSgcResBzbp.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResBzbp.class); + return util.exportExcel(list, "dikeMark"); + } + + /** + * 获取堤防标识标牌详细信息 + */ + @ApiOperation(" 堤防标识标牌详情") + @GetMapping(value = "/{embankmentCode}") + public AjaxResult getInfo(@PathVariable("embankmentCode") String embankmentCode) + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("res_code", embankmentCode); + queryWrapper.orderByAsc("sort_time"); + List list = bsSgcResBzbpService.list(queryWrapper); + return AjaxResult.success(list); + } + + /** + * 新增堤防标识标牌 + */ + @Log(title = "堤防标识标牌新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防标识标牌新增") + public AjaxResult add(@RequestBody List list) + { + for (BsSgcResBzbp BsSgcResBzbp : list) { + BaseEntityUtils.preInsert(BsSgcResBzbp); + BsSgcResBzbp.setSortTime(new Date()); + String adcd = BsSgcResBzbp.getAdcd(); + if (adcd == null) { + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + BsSgcResBzbp.setAdcd(sysDept.getXzqhName()); + } + bsSgcResBzbpService.save(BsSgcResBzbp); + } + + + return AjaxResult.success(); + } + + /** + * 修改堤防标识标牌 + */ + @ApiOperation("堤防标识标牌修改") + @Log(title = "堤防标识标牌修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody List list) + { + for (BsSgcResBzbp BsSgcResBzbp : list) { + String adcd = BsSgcResBzbp.getAdcd(); + if (BsSgcResBzbp.getSortTime() == null) { + BsSgcResBzbp.setSortTime(new Date()); + } + if (adcd == null) { + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + BsSgcResBzbp.setAdcd(sysDept.getXzqhName()); + } + bsSgcResBzbpService.saveOrUpdate(BsSgcResBzbp); + } + return AjaxResult.success(); + } + + /** + * 删除堤防标识标牌 + */ + @ApiOperation("堤防标识标牌删除") + @Log(title = "堤防标识标牌删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcResBzbpService.removeByIds(Arrays.asList(ids))); + } + + @DeleteMapping("/del/{embankmentCodes}") + public AjaxResult del(@PathVariable String[] embankmentCodes) { + for (String embankmentCode : embankmentCodes) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.eq("embankment_code", embankmentCode); + + bsSgcResBzbpService.remove(queryWrapper); + } + + + return AjaxResult.success(); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxwzController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxwzController.java new file mode 100644 index 00000000..25937e8b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxwzController.java @@ -0,0 +1,131 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResFxwz; +import com.kms.yg.res.service.BsSgcResFxwzService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.ConditionView; +import com.shuili.common.core.domain.MongoOperType; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 水闸防汛物资Controller + * + * @author kms + * @date 2024-01-16 + */ +@RestController +@RequestMapping("/res/fxwz") +@Api(tags = "水闸防汛物资") +public class BsSgcResFxwzController extends BaseController +{ + @Autowired + private BsSgcResFxwzService bsSgcSzFxwzService; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + + /** + * 查询水闸防汛物资列表 + */ + @PostMapping("/list") + @ApiOperation("水闸防汛物资列表") + public IPage list(@RequestBody SearchParam sp) + { + List conditionViews = new ArrayList<>(); + ConditionView conditionView = new ConditionView(); + ConditionView cv = new ConditionView(); + BsSgcResFxwz data = sp.getData(); + if(data!=null&&StringUtils.isNotEmpty(data.getPersonName())){ + cv.setName("person_name"); + cv.setValue(data.getPersonName()); + cv.setType(MongoOperType.LIKE); + } + if(data!=null&&StringUtils.isNotEmpty(data.getMaterialName())){ + conditionView.setName("material_name"); + conditionView.setValue(data.getMaterialName()); + conditionView.setType(MongoOperType.LIKE); + } + conditionViews.add(conditionView); + conditionViews.add(cv); + sp.setConditionViews(conditionViews); + return bsSgcSzFxwzService.selectPage(sp); + } + + /** + * 导出水闸防汛物资列表 + */ + @Log(title = "水闸防汛物资导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸防汛物资导出") + public AjaxResult export(@RequestBody BsSgcResFxwz bsSgcSzFxwz) + { + List list = bsSgcSzFxwzService.listByIds(bsSgcSzFxwz.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResFxwz.class); + return util.exportExcel(list, "fxwz"); + } + + /** + * 获取水闸防汛物资详细信息 + */ + @ApiOperation(" 水闸防汛物资详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzFxwzService.getById(id)); + } + + /** + * 新增水闸防汛物资 + */ + @Log(title = "水闸防汛物资新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸防汛物资新增") + public AjaxResult add(@RequestBody BsSgcResFxwz bsSgcSzFxwz) + { + BaseEntityUtils.preInsert(bsSgcSzFxwz); + return toAjax(bsSgcSzFxwzService.save(bsSgcSzFxwz)); + } + + /** + * 修改水闸防汛物资 + */ + @ApiOperation("水闸防汛物资修改") + @Log(title = "水闸防汛物资修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResFxwz bsSgcSzFxwz) + { + return toAjax(bsSgcSzFxwzService.updateById(bsSgcSzFxwz)); + } + + /** + * 删除水闸防汛物资 + */ + @ApiOperation("水闸防汛物资删除") + @Log(title = "水闸防汛物资删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzFxwzService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java new file mode 100644 index 00000000..da82b860 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java @@ -0,0 +1,148 @@ +package com.kms.yg.res.controller; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; + + +import com.kms.yg.res.domain.AttResBase; +import com.kms.yg.res.domain.BsSgcResFxzz; +import com.kms.yg.res.domain.BsSgcResFxzzDto; +import com.kms.yg.res.domain.BsSgcResFxzzcy; +import com.kms.yg.res.service.AttResBaseService; +import com.kms.yg.res.service.BsSgcResFxzzService; +import com.kms.yg.res.service.BsSgcResFxzzcyService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + + +/** + * 防汛组织Controller + * + * @author kms + * @date 2024-01-16 + */ +@RestController +@RequestMapping("/res/fxzz") +@Api(tags = "防汛组织") +public class BsSgcResFxzzController extends BaseController +{ + @Autowired + private BsSgcResFxzzService bsSgcSzFxzzService; + + @Autowired + private AttResBaseService bsSgcSzSafeJbxxService; + + @Autowired + private BsSgcResFxzzcyService bsSgcSzFxzzcyService; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + + /** + * 查询防汛组织列表 + */ + @PostMapping("/list") + @ApiOperation("防汛组织列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzFxzzService.selectPage(sp); + } + + /** + * 导出防汛组织列表 + */ + @Log(title = "防汛组织导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("防汛组织导出") + public AjaxResult export(@RequestBody BsSgcResFxzz bsSgcSzFxzz) + { + List list = bsSgcSzFxzzService.listByIds(bsSgcSzFxzz.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResFxzz.class); + return util.exportExcel(list, "fxzz"); + } + + /** + * 获取防汛组织详细信息 + */ + @ApiOperation(" 防汛组织详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzFxzzService.getById(id)); + } + + /** + * 新增防汛组织 + */ + @Log(title = "防汛组织新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("防汛组织新增") + public AjaxResult add(@RequestBody BsSgcResFxzzDto dto) + { + String dikeCode = dto.getResCode(); + AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class) + .eq(AttResBase::getResCode, dikeCode)); + + byId.setRemark("4"); + bsSgcSzSafeJbxxService.updateById(byId); + BsSgcResFxzz bsSgcSzFxzz = new BsSgcResFxzz(); + BeanUtils.copyProperties(dto,bsSgcSzFxzz); + BaseEntityUtils.preInsert(bsSgcSzFxzz); + bsSgcSzFxzzService.save(bsSgcSzFxzz); + String id = bsSgcSzFxzz.getId(); + List cy = dto.getCy(); + if (CollectionUtil.isNotEmpty(cy)) { + cy.stream().forEach(x->x.setOrganizationId(id)); + return toAjax(bsSgcSzFxzzcyService.saveBatch(cy)); + }else { + return AjaxResult.success(); + } + + } + + /** + * 修改防汛组织 + */ + @ApiOperation("防汛组织修改") + @Log(title = "防汛组织修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResFxzz bsSgcSzFxzz) + { + String dikeCode = bsSgcSzFxzz.getResCode(); + AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class) + .eq(AttResBase::getResCode, dikeCode)); + byId.setRemark("4"); + bsSgcSzSafeJbxxService.updateById(byId); + return toAjax(bsSgcSzFxzzService.updateById(bsSgcSzFxzz)); + } + + /** + * 删除防汛组织 + */ + @ApiOperation("防汛组织删除") + @Log(title = "防汛组织删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzFxzzService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResJfglController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResJfglController.java new file mode 100644 index 00000000..c59e37c4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResJfglController.java @@ -0,0 +1,112 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; + +import com.kms.yg.res.domain.BsSgcResJfgl; +import com.kms.yg.res.service.BsSgcResJfglService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 经费管理Controller + * + * @author kms + * @date 2024-03-06 + */ +@RestController +@RequestMapping("/res/jfgl") +@Api(tags = "经费管理") +public class BsSgcResJfglController extends BaseController +{ + @Autowired + private BsSgcResJfglService BsSgcResJfglService; + + + + + @GetMapping("/listByCode/{code}") + public AjaxResult listById(@PathVariable("code") String code) + { + return AjaxResult.success(BsSgcResJfglService.getByCode(code)); + } + + + /** + * 查询经费管理列表 + */ + @PostMapping("/list") + @ApiOperation("经费管理列表") + public IPage list(@RequestBody SearchParam sp) + { + return BsSgcResJfglService.selectPage(sp); + } + + /** + * 导出经费管理列表 + */ + @Log(title = "经费管理导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("经费管理导出") + public AjaxResult export(@RequestBody BsSgcResJfgl BsSgcResJfgl) + { + List list = BsSgcResJfglService.listByIds(BsSgcResJfgl.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResJfgl.class); + return util.exportExcel(list, "jfgl"); + } + + /** + * 获取经费管理详细信息 + */ + @ApiOperation(" 经费管理详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(BsSgcResJfglService.getById(id)); + } + + /** + * 新增经费管理 + */ + @Log(title = "经费管理新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("经费管理新增") + public AjaxResult add(@RequestBody BsSgcResJfgl BsSgcResJfgl) + { + BaseEntityUtils.preInsert(BsSgcResJfgl); + return toAjax(BsSgcResJfglService.save(BsSgcResJfgl)); + } + + /** + * 修改经费管理 + */ + @ApiOperation("经费管理修改") + @Log(title = "经费管理修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResJfgl BsSgcResJfgl) + { + return toAjax(BsSgcResJfglService.updateById(BsSgcResJfgl)); + } + + /** + * 删除经费管理 + */ + @ApiOperation("经费管理删除") + @Log(title = "经费管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String ids) + { + return AjaxResult.success(BsSgcResJfglService.removeById(ids)); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYaxxController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYaxxController.java new file mode 100644 index 00000000..63bfe031 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYaxxController.java @@ -0,0 +1,111 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResYaxx; +import com.kms.yg.res.service.BsSgcResYaxxService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + + +/** + * 水闸预案Controller + * + * @author kms + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/res/yaxx") +@Api(tags = "水闸预案") +public class BsSgcResYaxxController extends BaseController +{ + @Autowired + private BsSgcResYaxxService bsSgcSzYaxxService; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + + /** + * 查询水闸预案列表 + */ + @PostMapping("/list") + @ApiOperation("水闸预案列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzYaxxService.selectPage(sp); + } + + /** + * 导出水闸预案列表 + */ + @Log(title = "水闸预案导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸预案导出") + public AjaxResult export(@RequestBody BsSgcResYaxx bsSgcSzYaxx) + { + List list = bsSgcSzYaxxService.listByIds(bsSgcSzYaxx.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResYaxx.class); + return util.exportExcel(list, "yaxx"); + } + + /** + * 获取水闸预案详细信息 + */ + @ApiOperation(" 水闸预案详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzYaxxService.getById(id)); + } + + /** + * 新增水闸预案 + */ + @Log(title = "水闸预案新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸预案新增") + public AjaxResult add(@RequestBody BsSgcResYaxx bsSgcSzYaxx) + { + BaseEntityUtils.preInsert(bsSgcSzYaxx); + return toAjax(bsSgcSzYaxxService.save(bsSgcSzYaxx)); + } + + /** + * 修改水闸预案 + */ + @ApiOperation("水闸预案修改") + @Log(title = "水闸预案修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResYaxx bsSgcSzYaxx) + { + return toAjax(bsSgcSzYaxxService.updateById(bsSgcSzYaxx)); + } + + /** + * 删除水闸预案 + */ + @ApiOperation("水闸预案删除") + @Log(title = "水闸预案删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzYaxxService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYhxxController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYhxxController.java new file mode 100644 index 00000000..1589246d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResYhxxController.java @@ -0,0 +1,115 @@ +package com.kms.yg.res.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResYhxx; +import com.kms.yg.res.service.BsSgcResYhxxService; +import com.kms.yg.sz.domain.dto.PieDto; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; +import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + +/** + * 水闸隐患信息Controller + * + * @author kms + * @date 2024-01-16 + */ +@RestController +@RequestMapping("/res/yhxx") +@Api(tags = "水闸隐患信息") +public class BsSgcResYhxxController extends BaseController +{ + @Autowired + private BsSgcResYhxxService bsSgcSzYhxxService; + + @Autowired + private SysXzqhService sysXzqhService; + + + + + + + /** + * 查询水闸隐患信息列表 + */ + @PostMapping("/list") + @ApiOperation("水闸隐患信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzYhxxService.selectPage(sp); + } + + /** + * 导出水闸隐患信息列表 + */ + @Log(title = "水闸隐患信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸隐患信息导出") + public AjaxResult export(@RequestBody BsSgcResYhxx bsSgcSzYhxx) + { + List list = bsSgcSzYhxxService.listByIds(bsSgcSzYhxx.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcResYhxx.class); + return util.exportExcel(list, "yhxx"); + } + + /** + * 获取水闸隐患信息详细信息 + */ + @ApiOperation(" 水闸隐患信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzYhxxService.getById(id)); + } + + /** + * 新增水闸隐患信息 + */ + @Log(title = "水闸隐患信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸隐患信息新增") + public AjaxResult add(@RequestBody BsSgcResYhxx bsSgcSzYhxx) + { + BaseEntityUtils.preInsert(bsSgcSzYhxx); + return toAjax(bsSgcSzYhxxService.save(bsSgcSzYhxx)); + } + + /** + * 修改水闸隐患信息 + */ + @ApiOperation("水闸隐患信息修改") + @Log(title = "水闸隐患信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcResYhxx bsSgcSzYhxx) + { + return toAjax(bsSgcSzYhxxService.updateById(bsSgcSzYhxx)); + } + + /** + * 删除水闸隐患信息 + */ + @ApiOperation("水闸隐患信息删除") + @Log(title = "水闸隐患信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzYhxxService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/AttResDangerKnowledge.java b/shuili-system/src/main/java/com/kms/yg/res/domain/AttResDangerKnowledge.java new file mode 100644 index 00000000..454114cc --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/AttResDangerKnowledge.java @@ -0,0 +1,48 @@ +package com.kms.yg.res.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 水库隐患处置知识库对象 att_res_danger_knowledge + * + * @author kms + * @date 2025-03-14 + */ +@TableName("att_res_danger_knowledge") +@Data +@ApiModel("水库隐患处置知识库") +public class AttResDangerKnowledge extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 文档名称 */ + @Excel(name = "文档名称") + @ApiModelProperty("文档名称") + private String name; + + /** 关键词 */ + @Excel(name = "关键词") + @ApiModelProperty("关键词") + private String keyword; + + /** 附件 */ + @Excel(name = "附件") + @ApiModelProperty("附件") + private String file; + + /** $column.columnComment */ + @ApiModelProperty("附件") + private String createUid; + + /** $column.columnComment */ + @ApiModelProperty("附件") + private String updateUid; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java new file mode 100644 index 00000000..846a82ff --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java @@ -0,0 +1,59 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 水闸备用电源主对象 bs_sgc_df_bydyzb + * + * @author kms + * @date 2024-01-17 + */ +@TableName("bs_sgc_df_bydyzb_v2") +@Data +@ApiModel("水闸备用电源主") +public class BsSgcResBydyzb extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 水闸id */ + @Excel(name = "水闸id") + @ApiModelProperty("水闸id") + private String resCode; + + /** 电源种类 */ + @Excel(name = "电源种类") + @ApiModelProperty("电源种类") + private String powerType; + + /** 水闸名称 */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String resName; + + /** $column.columnComment */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String relation; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBzbp.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBzbp.java new file mode 100644 index 00000000..d64f1eb1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBzbp.java @@ -0,0 +1,106 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 堤防标识标牌对象 bs_sgc_df_bzbp + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_df_bzbp_v2") +@Data +@ApiModel("堤防标识标牌") +public class BsSgcResBzbp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 标志名称 */ + @Excel(name = "标志名称") + @ApiModelProperty("标志名称") + private String markName; + + /** 堤防id */ + @Excel(name = "堤防编码") + @ApiModelProperty("堤防编码") + @TableField("res_code") + private String resCode; + + /** 标识位置 */ + @Excel(name = "标识位置") + @ApiModelProperty("标识位置") + private String markLocation; + + /** 标牌类型 */ + @Excel(name = "标牌类型") + @ApiModelProperty("标牌类型") + private String type; + + /** 标识类型 */ + @Excel(name = "标识类型") + @ApiModelProperty("标识类型") + private String markType; + + /** 上传图片 */ + @Excel(name = "上传图片") + @ApiModelProperty("上传图片") + private String photo; + + /** 标牌编号 */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String markCode; + + /** $column.columnComment */ + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String relation; + + private String adcd; + + @TableField("res_name") + private String resName; + + @TableField(exist = false) + private String number; + + @TableField(exist = false) + private String oneType; + @TableField(exist = false) + private String twoType; + @TableField(exist = false) + private String threeType; + @TableField(exist = false) + private String fourType; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8") + private Date sortTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxwz.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxwz.java new file mode 100644 index 00000000..b7a01360 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxwz.java @@ -0,0 +1,94 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 水闸防汛物资对象 bs_sgc_df_fxwz + * + * @author kms + * @date 2024-01-16 + */ +@TableName("bs_sgc_df_fxwz_v2") +@Data +@ApiModel("水闸防汛物资") +public class BsSgcResFxwz extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 水闸id */ + @Excel(name = "水闸id") + @ApiModelProperty("水闸id") + private String resCode; + + /** 物资名称 */ + @Excel(name = "物资名称") + @ApiModelProperty("物资名称") + private String materialName; + + /** 水闸名称 */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String resName; + + /** 负责人名称 */ + @Excel(name = "负责人名称") + @ApiModelProperty("负责人名称") + private String personName; + + /** 负责人电话 */ + @Excel(name = "负责人电话") + @ApiModelProperty("负责人电话") + private String personPhone; + + /** 负责人职务 */ + @Excel(name = "负责人职务") + @ApiModelProperty("负责人职务") + private String personLevel; + + /** 物资数量 */ + @Excel(name = "物资数量") + @ApiModelProperty("物资数量") + private String materialNumber; + + /** 采购时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "采购时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("采购时间") + private Date procurementTime; + + /** 物资种类 */ + @Excel(name = "物资种类") + @ApiModelProperty("物资种类") + private String materialType; + + /** $column.columnComment */ + @Excel(name = "物资种类") + @ApiModelProperty("物资种类") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "物资种类") + @ApiModelProperty("物资种类") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "物资种类") + @ApiModelProperty("物资种类") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "物资种类") + @ApiModelProperty("物资种类") + private String relation; + + @ApiModelProperty("保质期") + private String shelfLife; +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzz.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzz.java new file mode 100644 index 00000000..6f37507d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzz.java @@ -0,0 +1,96 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 防汛组织对象 bs_sgc_df_fxzz + * + * @author kms + * @date 2024-01-16 + */ +@TableName("bs_sgc_df_fxzz_v2") +@Data +@ApiModel("防汛组织") +public class BsSgcResFxzz extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 组织名称 */ + @Excel(name = "组织名称") + @ApiModelProperty("组织名称") + private String organizationName; + + /** 所属区划 */ + @Excel(name = "所属区划") + @ApiModelProperty("所属区划") + private String adcd; + + /** 负责人名称 */ + @Excel(name = "负责人名称") + @ApiModelProperty("负责人名称") + private String chargePersonName; + + /** 负责人电话 */ + @Excel(name = "负责人电话") + @ApiModelProperty("负责人电话") + private String chargePersonPhone; + + /** 负责人职务 */ + @Excel(name = "负责人职务") + @ApiModelProperty("负责人职务") + private String chargePersonDuites; + + /** 负责人类型 */ + @Excel(name = "负责人类型") + @ApiModelProperty("负责人类型") + private String chargePersonType; + + + /** $column.columnComment */ + @Excel(name = "成员") + @ApiModelProperty("成员") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "成员") + @ApiModelProperty("成员") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "成员") + @ApiModelProperty("成员") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "成员") + @ApiModelProperty("成员") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "成员") + @ApiModelProperty("成员") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "成员") + @ApiModelProperty("成员") + private String relation; + + + @TableField("res_name") + private String resName; + + @TableField("res_type") + private String resType; + + private String resCode; + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzDto.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzDto.java new file mode 100644 index 00000000..59cd1159 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzDto.java @@ -0,0 +1,17 @@ +package com.kms.yg.res.domain; + +import com.kms.yg.df.domain.BsSgcDfFxzz; +import com.kms.yg.df.domain.BsSgcDfFxzzcy; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class BsSgcResFxzzDto extends BsSgcResFxzz implements Serializable { + + + private List cy; + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzcy.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzcy.java new file mode 100644 index 00000000..81acd55f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResFxzzcy.java @@ -0,0 +1,64 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 水闸防汛组织成员对象 bs_sgc_df_fxzzcy + * + * @author kms + * @date 2024-01-17 + */ +@TableName("bs_sgc_df_fxzzcy_v2") +@Data +@ApiModel("水闸防汛组织成员") +public class BsSgcResFxzzcy extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 组织id */ + @Excel(name = "组织id") + @ApiModelProperty("组织id") + private String organizationId; + + /** 组织人员名称 */ + @Excel(name = "组织人员名称") + @ApiModelProperty("组织人员名称") + private String name; + + /** 职务 */ + @Excel(name = "职务") + @ApiModelProperty("职务") + private String duites; + + /** 电话 */ + @Excel(name = "电话") + @ApiModelProperty("电话") + private String phone; + + /** $column.columnComment */ + @Excel(name = "电话") + @ApiModelProperty("电话") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "电话") + @ApiModelProperty("电话") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "电话") + @ApiModelProperty("电话") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "电话") + @ApiModelProperty("电话") + private String relation; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResJfgl.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResJfgl.java new file mode 100644 index 00000000..b8df7a4a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResJfgl.java @@ -0,0 +1,87 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 经费管理对象 bs_sgc_df_jfgl + * + * @author kms + * @date 2024-03-06 + */ +@TableName("bs_sgc_df_jfgl_v2") +@Data +@ApiModel("经费管理") +public class BsSgcResJfgl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 堤防编码 */ + @Excel(name = "堤防编码") + @ApiModelProperty("堤防编码") + private String resCode; + + /** 单位名称 */ + @Excel(name = "单位名称") + @ApiModelProperty("单位名称") + private String unitName; + + /** 人员数量 */ + @Excel(name = "人员数量") + @ApiModelProperty("人员数量") + private Long peopleNum; + + /** 经费 */ + @Excel(name = "经费") + @ApiModelProperty("经费") + private String funds; + + /** 经费用途 */ + @Excel(name = "经费用途") + @ApiModelProperty("经费用途") + private String fundsPurpose; + + /** $column.columnComment */ + @Excel(name = "经费用途") + @ApiModelProperty("经费用途") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "经费用途") + @ApiModelProperty("经费用途") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "经费用途") + @ApiModelProperty("经费用途") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "经费用途") + @ApiModelProperty("经费用途") + private String relation; + + /** $column.columnComment */ + @Excel(name = "经费用途") + @ApiModelProperty("经费用途") + private String type; + + + @TableField(exist = false) + private String resName; + @TableField(exist = false) + private String resType; + @TableField(exist = false) + private String engScal; + @TableField(exist = false) + private String unit; + @TableField(exist = false) + private String adcd; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYaxx.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYaxx.java new file mode 100644 index 00000000..b93e054a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYaxx.java @@ -0,0 +1,98 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 水闸预案对象 bs_sgc_df_yaxx + * + * @author kms + * @date 2024-01-23 + */ +@TableName("bs_sgc_df_yaxx_v2") +@Data +@ApiModel("水闸预案") +public class BsSgcResYaxx extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 水闸id */ + @Excel(name = "水闸id") + @ApiModelProperty("水闸id") + private String resId; + + /** 水闸代码 */ + @Excel(name = "水闸代码") + @ApiModelProperty("水闸代码") + private String resCode; + + /** 水闸名称 */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String resName; + + /** 水闸类型 */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String dikeType; + + /** 工程规模 */ + @Excel(name = "工程规模") + @ApiModelProperty("工程规模") + private String engineerScale; + + /** 负责人 */ + @Excel(name = "负责人") + @ApiModelProperty("负责人") + private String personName; + + /** 类型 */ + @Excel(name = "类型") + @ApiModelProperty("类型") + private String type; + + /** 开展时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开展时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("开展时间") + private Date implementationTime; + + /** 预案内容 */ + @Excel(name = "预案内容") + @ApiModelProperty("预案内容") + private String planContent; + + /** 图片 */ + @Excel(name = "附件") + @ApiModelProperty("附件") + private String photo; + + /** $column.columnComment */ + @Excel(name = "图片") + @ApiModelProperty("图片") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "图片") + @ApiModelProperty("图片") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "图片") + @ApiModelProperty("图片") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "图片") + @ApiModelProperty("图片") + private String relation; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYhxx.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYhxx.java new file mode 100644 index 00000000..1b580505 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResYhxx.java @@ -0,0 +1,124 @@ +package com.kms.yg.res.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 水闸隐患信息对象 bs_sgc_df_yhxx + * + * @author kms + * @date 2024-01-16 + */ +@TableName("bs_sgc_df_yhxx_v2") +@Data +@ApiModel("水闸隐患信息") +public class BsSgcResYhxx extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 水闸id */ + @Excel(name = "水闸id") + @ApiModelProperty("水闸id") + private String resCode; + + private String head; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date processingTime; + + /** 提出人 */ + @Excel(name = "提出人") + @ApiModelProperty("提出人") + private String proposer; + + /** 发现时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "发现时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("发现时间") + private Date findTime; + + /** 地点 */ + @Excel(name = "地点") + @ApiModelProperty("地点") + private String address; + + /** 巡查类型 */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private String inspectionType; + + /** 所属仪器 */ + @Excel(name = "所属仪器") + @ApiModelProperty("所属仪器") + private String instrument; + + /** 隐患详情 */ + @Excel(name = "隐患详情") + @ApiModelProperty("隐患详情") + private String dangerDetail; + + /** 图片 */ + @Excel(name = "图片") + @ApiModelProperty("图片") + private String photo; + + /** 状态 */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private String status; + + /** 花费资金 */ + @Excel(name = "花费资金") + @ApiModelProperty("花费资金") + private BigDecimal cost; + + /** 处理方案 */ + @Excel(name = "处理方案") + @ApiModelProperty("处理方案") + private String finishMethod; + + /** 隐患处理结果信息 */ + @Excel(name = "隐患处理结果信息") + @ApiModelProperty("隐患处理结果信息") + private String result; + + /** 水闸名称 */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String resName; + + /** 水闸类型 */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String resType; + + /** $column.columnComment */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String relation; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResDangerKnowledgeMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResDangerKnowledgeMapper.java new file mode 100644 index 00000000..75703a37 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResDangerKnowledgeMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.res.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.res.domain.AttResDangerKnowledge; + +/** + * 水库隐患处置知识库Mapper接口 + * + * @author kms + * @date 2025-03-14 + */ +@Repository +public interface AttResDangerKnowledgeMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBydyzbMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBydyzbMapper.java new file mode 100644 index 00000000..404c8d80 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBydyzbMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfBydyzb; +import com.kms.yg.res.domain.BsSgcResBydyzb; +import org.springframework.stereotype.Repository; + +/** + * 水闸备用电源主Mapper接口 + * + * @author kms + * @date 2024-01-17 + */ +@Repository +public interface BsSgcResBydyzbMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBzbpMapper.java new file mode 100644 index 00000000..bb359543 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResBzbpMapper.java @@ -0,0 +1,21 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfBzbp; +import com.kms.yg.res.domain.BsSgcResBzbp; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 堤防标识标牌Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcResBzbpMapper extends BaseMapper { + + List selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode); +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxwzMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxwzMapper.java new file mode 100644 index 00000000..dbed45ee --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxwzMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfFxwz; +import com.kms.yg.res.domain.BsSgcResFxwz; +import org.springframework.stereotype.Repository; + +/** + * 水闸防汛物资Mapper接口 + * + * @author kms + * @date 2024-01-16 + */ +@Repository +public interface BsSgcResFxwzMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzMapper.java new file mode 100644 index 00000000..ffbc1496 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzMapper.java @@ -0,0 +1,18 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfFxzz; +import com.kms.yg.res.domain.BsSgcResFxzz; +import org.springframework.stereotype.Repository; + + +/** + * 防汛组织Mapper接口 + * + * @author kms + * @date 2024-01-16 + */ +@Repository +public interface BsSgcResFxzzMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzcyMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzcyMapper.java new file mode 100644 index 00000000..6247af85 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResFxzzcyMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfFxzzcy; +import com.kms.yg.res.domain.BsSgcResFxzzcy; +import org.springframework.stereotype.Repository; + +/** + * 水闸防汛组织成员Mapper接口 + * + * @author kms + * @date 2024-01-17 + */ +@Repository +public interface BsSgcResFxzzcyMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResJfglMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResJfglMapper.java new file mode 100644 index 00000000..8b349ecd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResJfglMapper.java @@ -0,0 +1,29 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfJfgl; +import com.kms.yg.res.domain.BsSgcResJfgl; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 经费管理Mapper接口 + * + * @author kms + * @date 2024-03-06 + */ +@Repository +public interface BsSgcResJfglMapper extends BaseMapper { + + + List getList(@Param("id") String id, + @Param("dikeType") String dikeType, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYaxxMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYaxxMapper.java new file mode 100644 index 00000000..000597b7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYaxxMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfYaxx; +import com.kms.yg.res.domain.BsSgcResYaxx; +import org.springframework.stereotype.Repository; + +/** + * 水闸预案Mapper接口 + * + * @author kms + * @date 2024-01-23 + */ +@Repository +public interface BsSgcResYaxxMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYhxxMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYhxxMapper.java new file mode 100644 index 00000000..6fbdc6aa --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/BsSgcResYhxxMapper.java @@ -0,0 +1,22 @@ +package com.kms.yg.res.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfYhxx; +import com.kms.yg.res.domain.BsSgcResYhxx; +import com.kms.yg.sz.domain.dto.PieDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 水闸隐患信息Mapper接口 + * + * @author kms + * @date 2024-01-16 + */ +@Repository +public interface BsSgcResYhxxMapper extends BaseMapper { + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/AttResDangerKnowledgeService.java b/shuili-system/src/main/java/com/kms/yg/res/service/AttResDangerKnowledgeService.java new file mode 100644 index 00000000..af767c84 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/AttResDangerKnowledgeService.java @@ -0,0 +1,16 @@ +package com.kms.yg.res.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yg.res.mapper.AttResDangerKnowledgeMapper; +import com.kms.yg.res.domain.AttResDangerKnowledge; +import org.springframework.stereotype.Service; +/** + * 水库隐患处置知识库Service接口 + * + * @author kms + * @date 2025-03-14 + */ +@Service +public class AttResDangerKnowledgeService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBydyzbService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBydyzbService.java new file mode 100644 index 00000000..9eb3f954 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBydyzbService.java @@ -0,0 +1,19 @@ +package com.kms.yg.res.service; + +import com.kms.yg.df.domain.BsSgcDfBydyzb; +import com.kms.yg.df.mapper.BsSgcDfBydyzbMapper; +import com.kms.yg.res.domain.BsSgcResBydyzb; +import com.kms.yg.res.mapper.BsSgcResBydyzbMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸备用电源主Service接口 + * + * @author kms + * @date 2024-01-17 + */ +@Service +public class BsSgcResBydyzbService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBzbpService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBzbpService.java new file mode 100644 index 00000000..8499625f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResBzbpService.java @@ -0,0 +1,65 @@ +package com.kms.yg.res.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.kms.yg.df.mapper.BsSgcDfBzbpMapper; +import com.kms.yg.res.domain.BsSgcResBzbp; +import com.kms.yg.res.mapper.BsSgcResBzbpMapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 堤防标识标牌Service接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcResBzbpService extends BaseService{ + + @Autowired + private BsSgcResBzbpMapper bsSgcResBzbpMapper; + + public IPage selectPage(SearchParam sp, String adcd) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + BsSgcResBzbp projectInfo = sp.getData(); + + if (projectInfo != null) { + String resCode=projectInfo.getResCode(); +// String projectType = projectInfo.getEmbankmentType(); + + queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId()); + queryWrapper.like(resCode != null, "res_code", resCode); +// queryWrapper.like(projectType != null, "embankment_type", projectType); + } + + + Map params = sp.getParams(); + if (params!=null) { + //create_time + if (params.get("orderBy") != null) { + String orderBy = (String) params.get("orderBy"); + queryWrapper.orderByDesc(orderBy != null, orderBy); + } + } + + + Page page = new Page<>(sp.getPageNum(),sp.getPageSize()); + List infoPage = bsSgcResBzbpMapper + .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getResName()); + Page bsSgcDfBzbpPage = new Page<>(); + + bsSgcDfBzbpPage.setRecords(infoPage); + bsSgcDfBzbpPage.setTotal(infoPage.size()); + return bsSgcDfBzbpPage; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxwzService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxwzService.java new file mode 100644 index 00000000..7630c1c8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxwzService.java @@ -0,0 +1,19 @@ +package com.kms.yg.res.service; + +import com.kms.yg.df.domain.BsSgcDfFxwz; +import com.kms.yg.df.mapper.BsSgcDfFxwzMapper; +import com.kms.yg.res.domain.BsSgcResFxwz; +import com.kms.yg.res.mapper.BsSgcResFxwzMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸防汛物资Service接口 + * + * @author kms + * @date 2024-01-16 + */ +@Service +public class BsSgcResFxwzService extends BaseService { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzService.java new file mode 100644 index 00000000..9e117316 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzService.java @@ -0,0 +1,19 @@ +package com.kms.yg.res.service; + +import com.kms.yg.df.mapper.BsSgcDfFxzzMapper; +import com.kms.yg.res.domain.BsSgcResFxzz; +import com.kms.yg.res.mapper.BsSgcResFxzzMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + + +/** + * 防汛组织Service接口 + * + * @author kms + * @date 2024-01-16 + */ +@Service +public class BsSgcResFxzzService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzcyService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzcyService.java new file mode 100644 index 00000000..77e3339f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResFxzzcyService.java @@ -0,0 +1,19 @@ +package com.kms.yg.res.service; + +import com.kms.yg.df.domain.BsSgcDfFxzzcy; +import com.kms.yg.df.mapper.BsSgcDfFxzzcyMapper; +import com.kms.yg.res.domain.BsSgcResFxzzcy; +import com.kms.yg.res.mapper.BsSgcResFxzzcyMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸防汛组织成员Service接口 + * + * @author kms + * @date 2024-01-17 + */ +@Service +public class BsSgcResFxzzcyService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResJfglService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResJfglService.java new file mode 100644 index 00000000..dae7ac40 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResJfglService.java @@ -0,0 +1,59 @@ +package com.kms.yg.res.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; + +import com.kms.yg.res.domain.BsSgcResJfgl; +import com.kms.yg.res.mapper.BsSgcResJfglMapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 经费管理Service接口 + * + * @author kms + * @date 2024-03-06 + */ +@Service +public class BsSgcResJfglService extends BaseService{ + + + @Autowired + private BsSgcResJfglMapper BsSgcResJfglMapper; + + + + @Autowired + private SysXzqhService sysXzqhService; + + public IPage selectPage(SearchParam sp) { + + BsSgcResJfgl data = sp.getData(); + + List list= BsSgcResJfglMapper.getList(data.getId(), data.getResType(), data.getResName(), + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + + Page page = new Page<>(); + page.setRecords(list); + + page.setTotal(list.size()); + + return page; + + } + + public List getByCode(String code) { + List bsSgcSzJfgls = BsSgcResJfglMapper.selectList(Wrappers.lambdaQuery(BsSgcResJfgl.class) + .eq(BsSgcResJfgl::getResCode, code)); + + return bsSgcSzJfgls; + + } + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYaxxService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYaxxService.java new file mode 100644 index 00000000..7437af9e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYaxxService.java @@ -0,0 +1,19 @@ +package com.kms.yg.res.service; + +import com.kms.yg.df.domain.BsSgcDfYaxx; +import com.kms.yg.df.mapper.BsSgcDfYaxxMapper; +import com.kms.yg.res.domain.BsSgcResYaxx; +import com.kms.yg.res.mapper.BsSgcResYaxxMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 水闸预案Service接口 + * + * @author kms + * @date 2024-01-23 + */ +@Service +public class BsSgcResYaxxService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYhxxService.java b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYhxxService.java new file mode 100644 index 00000000..a5de2497 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/res/service/BsSgcResYhxxService.java @@ -0,0 +1,28 @@ +package com.kms.yg.res.service; + +import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfYhxx; +import com.kms.yg.df.mapper.BsSgcDfYhxxMapper; +import com.kms.yg.res.domain.BsSgcResYhxx; +import com.kms.yg.res.mapper.BsSgcResYhxxMapper; +import com.kms.yg.sz.domain.dto.HistogramDto; +import com.kms.yg.sz.domain.dto.PieDto; +import com.shuili.common.core.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; + +/** + * 水闸隐患信息Service接口 + * + * @author kms + * @date 2024-01-16 + */ +@Service +public class BsSgcResYhxxService extends BaseService { + + + +} diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml index 3c1476fe..75cd6a12 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml @@ -139,7 +139,7 @@ AND sj.create_time >= #{startDate} - AND sj.create_time < #{endDate} + AND sj.create_time < #{endDate} diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml index 57b4aecd..662da5b7 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml @@ -5,7 +5,7 @@ - select * + select DISTINCT * from bs_sgc_df_jfgl sf left join att_dike_base sj on sf.dike_code = sj.dike_code @@ -41,5 +41,6 @@ and sf.id=#{id} + group by sf.dike_code diff --git a/shuili-system/src/main/resources/mapper/yg/res/BsSgcResBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/res/BsSgcResBzbpMapper.xml new file mode 100644 index 00000000..0f2be44d --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/res/BsSgcResBzbpMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/res/BsSgcResJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/res/BsSgcResJfglMapper.xml new file mode 100644 index 00000000..7d14f783 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/res/BsSgcResJfglMapper.xml @@ -0,0 +1,42 @@ + + + + + + select DISTINCT * + from bs_sgc_df_jfgl_v2 sf + left join att_res_base sj on sf.res_code = sj.res_code + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index aa1b0161..e6196d34 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -140,7 +140,7 @@ AND sj.create_time >= #{startDate} - AND sj.create_time < #{endDate} + AND sj.create_time < #{endDate} diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml index 6aef7db6..b43d01e7 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml @@ -5,9 +5,9 @@ - select * + select DISTINCT * from bs_sgc_sz_jfgl sf - left join att_waga_base sj on sf.waga_code = sj.waga_code + inner join att_waga_base sj on sf.waga_code = sj.waga_code @@ -41,5 +41,6 @@ and sf.id=#{id} + group by sf.waga_code;