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}