- 添加 WaterUserInfo 供水用水户信息数据接口

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/WaterSupply/WaterUserInfo/WaterUserInfoController.java

@@ -0,0 +1,226 @@
+package com.zksy.web.controller.WaterSupply.WaterUserInfo;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.WaterSupply.WaterUserInfo.domain.WaterUserInfo;
+import com.zksy.WaterSupply.WaterUserInfo.service.IWaterUserInfoService;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.utils.SecurityUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 用水户信息管理接口
+ */
+@RestController
+@RequestMapping("/api/water/userInfo")
+@Api(tags = "供水管网-用水户信息数据接口")
+public class WaterUserInfoController {
+
+    private static final Logger log = LoggerFactory.getLogger(WaterUserInfoController.class);
+
+    @Autowired
+    private IWaterUserInfoService waterUserInfoService;
+
+    // -------------------------- 基础CRUD接口 --------------------------
+    @GetMapping("/page")
+    @ApiOperation(value = "分页查询用水户数据", notes = "支持按用户编号、名称、状态、用户类型、时间范围模糊查询")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "查询成功", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，查询失败", response = AjaxResult.class)
+    })
+    public AjaxResult queryPage(
+            @ApiParam(value = "页码", defaultValue = "1") @RequestParam(defaultValue = "1") Integer pageNum,
+            @ApiParam(value = "每页大小", defaultValue = "10") @RequestParam(defaultValue = "10") Integer pageSize,
+            @ApiParam(value = "用户编号") @RequestParam(required = false) String userCode,
+            @ApiParam(value = "用户名称") @RequestParam(required = false) String userName,
+            @ApiParam(value = "用户状态（0正常 1欠费 2停用）") @RequestParam(required = false) String status,
+            @ApiParam(value = "用户类型（居民/工业/商业/行政事业）") @RequestParam(required = false) String userType,
+            @ApiParam(value = "开始时间（格式：yyyy-MM-dd HH:mm:ss）", example = "2025-01-01 00:00:00") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
+            @ApiParam(value = "结束时间（格式：yyyy-MM-dd HH:mm:ss）", example = "2025-12-31 23:59:59") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+        try {
+            Page<WaterUserInfo> page = new Page<>(pageNum, pageSize);
+            IPage<WaterUserInfo> resultPage = waterUserInfoService.queryPage(page, userCode, userName, status, userType, startTime, endTime);
+            return AjaxResult.success("查询成功", resultPage);
+        } catch (Exception e) {
+            log.error("分页查询用水户数据异常", e);
+            return AjaxResult.error("查询失败：" + e.getMessage());
+        }
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "根据ID查询用水户详情", notes = "传入用水户ID获取完整信息")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "查询成功", response = AjaxResult.class),
+            @ApiResponse(code = 404, message = "未找到指定ID的用水户信息", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，查询失败", response = AjaxResult.class)
+    })
+    public AjaxResult getById(
+            @ApiParam(value = "用水户ID", required = true, example = "0") @PathVariable Long id) {
+        try {
+            WaterUserInfo data = waterUserInfoService.getById(id);
+            return data == null ? AjaxResult.warn("未找到该用水户信息") : AjaxResult.success("查询成功", data);
+        } catch (Exception e) {
+            log.error("查询用水户详情异常", e);
+            return AjaxResult.error("查询失败：" + e.getMessage());
+        }
+    }
+
+    @PostMapping
+    @ApiOperation(value = "新增用水户信息", notes = "传入用水户实体对象进行新增")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "新增成功", response = AjaxResult.class),
+            @ApiResponse(code = 400, message = "请求参数错误", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，新增失败", response = AjaxResult.class)
+    })
+    public AjaxResult add(@RequestBody WaterUserInfo waterUserInfo) {
+        try {
+            waterUserInfo.setDelFlag("0");
+            try {
+                waterUserInfo.setCreateBy(SecurityUtils.getUsername());
+            } catch (Exception e) {
+                waterUserInfo.setCreateBy("system");
+            }
+            waterUserInfo.setCreateTime(LocalDateTime.now());
+            boolean result = waterUserInfoService.save(waterUserInfo);
+            return result ? AjaxResult.success("新增成功") : AjaxResult.error("新增失败");
+        } catch (Exception e) {
+            log.error("新增用水户信息异常", e);
+            return AjaxResult.error("新增失败：" + e.getMessage());
+        }
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改用水户信息", notes = "传入用水户实体对象进行修改，仅更新非空字段")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "修改成功", response = AjaxResult.class),
+            @ApiResponse(code = 400, message = "请求参数错误", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，修改失败", response = AjaxResult.class)
+    })
+    public AjaxResult update(@RequestBody WaterUserInfo waterUserInfo) {
+        try {
+            // 禁止修改关键字段
+            waterUserInfo.setDelFlag(null);
+            waterUserInfo.setCreateBy(null);
+            waterUserInfo.setCreateTime(null);
+
+            try {
+                waterUserInfo.setUpdateBy(SecurityUtils.getUsername());
+            } catch (Exception e) {
+                waterUserInfo.setUpdateBy("system");
+            }
+            waterUserInfo.setUpdateTime(LocalDateTime.now());
+
+            boolean result = waterUserInfoService.updateById(waterUserInfo);
+            return result ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败");
+        } catch (Exception e) {
+            log.error("修改用水户信息异常", e);
+            return AjaxResult.error("修改失败：" + e.getMessage());
+        }
+    }
+
+    @DeleteMapping("/{ids}")
+    @ApiOperation(value = "批量逻辑删除用水户信息", notes = "多个ID用逗号分隔，逻辑删除（移入回收站）,不物理删除数据")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "删除成功", response = AjaxResult.class),
+            @ApiResponse(code = 400, message = "请求参数错误", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，删除失败", response = AjaxResult.class)
+    })
+    public AjaxResult remove(
+            @ApiParam(value = "用水户ID数组，多个用逗号分隔", required = true, example = "1,2,3") @PathVariable Long[] ids) {
+        try {
+            log.info("开始删除用水户数据，ids: {}", (Object) ids);
+            boolean result = waterUserInfoService.removeByIds(List.of(ids));
+            return result
+                    ? AjaxResult.success("删除成功，已移入回收站，共删除 " + ids.length + " 条数据")
+                    : AjaxResult.error("删除失败");
+        } catch (Exception e) {
+            log.error("删除用水户数据异常", e);
+            return AjaxResult.error("删除失败：" + e.getMessage());
+        }
+    }
+
+    // -------------------------- 回收站接口 --------------------------
+    @GetMapping("/recycle/list")
+    @ApiOperation(value = "查询回收站数据", notes = "分页查询已删除的用水户数据，支持筛选和时间范围")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "查询成功", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，查询失败", response = AjaxResult.class)
+    })
+    public AjaxResult recycleList(
+            @ApiParam(value = "页码", defaultValue = "1") @RequestParam(defaultValue = "1") Integer pageNum,
+            @ApiParam(value = "每页大小", defaultValue = "10") @RequestParam(defaultValue = "10") Integer pageSize,
+            @ApiParam(value = "用户编号") @RequestParam(required = false) String userCode,
+            @ApiParam(value = "用户名称") @RequestParam(required = false) String userName,
+            @ApiParam(value = "用户状态（0正常 1欠费 2停用）") @RequestParam(required = false) String status,
+            @ApiParam(value = "开始时间（格式：yyyy-MM-dd HH:mm:ss）", example = "2025-01-01 00:00:00") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
+            @ApiParam(value = "结束时间（格式：yyyy-MM-dd HH:mm:ss）", example = "2025-12-31 23:59:59") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+        try {
+            Page<WaterUserInfo> page = new Page<>(pageNum, pageSize);
+            IPage<WaterUserInfo> resultPage = waterUserInfoService.queryDeletedPage(page, userCode, userName, status, startTime, endTime);
+            return AjaxResult.success("查询成功", resultPage);
+        } catch (Exception e) {
+            log.error("查询回收站数据异常", e);
+            return AjaxResult.error("查询失败：" + e.getMessage());
+        }
+    }
+
+    @PostMapping("/recycle/restore/{ids}")
+    @ApiOperation(value = "批量恢复已删除数据", notes = "多个ID用逗号分隔，将数据从回收站恢复为正常状态")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "恢复成功", response = AjaxResult.class),
+            @ApiResponse(code = 400, message = "请选择要恢复的数据", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，恢复失败", response = AjaxResult.class)
+    })
+    public AjaxResult restore(
+            @ApiParam(value = "用水户ID数组，多个用逗号分隔", required = true, example = "3,4") @PathVariable Long[] ids) {
+        try {
+            log.info("开始恢复用水户数据，ids: {}", (Object) ids);
+            String updateBy = "system";
+            try {
+                updateBy = SecurityUtils.getUsername();
+            } catch (Exception e) {
+                log.warn("未获取到登录用户，使用默认值system");
+            }
+
+            boolean result = waterUserInfoService.restoreByIds(List.of(ids), updateBy);
+            return result
+                    ? AjaxResult.success("恢复成功，共恢复 " + ids.length + " 条数据")
+                    : AjaxResult.error("恢复失败");
+        } catch (Exception e) {
+            log.error("恢复数据异常", e);
+            return AjaxResult.error("恢复失败：" + e.getMessage());
+        }
+    }
+
+    @DeleteMapping("/recycle/delete/{ids}")
+    @ApiOperation(value = "批量彻底删除数据（不可恢复）", notes = "多个ID用逗号分隔，物理删除数据库中的数据，谨慎使用")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "彻底删除成功", response = AjaxResult.class),
+            @ApiResponse(code = 400, message = "请选择要删除的数据", response = AjaxResult.class),
+            @ApiResponse(code = 500, message = "服务器内部错误，删除失败", response = AjaxResult.class)
+    })
+    public AjaxResult deletePhysically(
+            @ApiParam(value = "用水户ID数组，多个用逗号分隔", required = true, example = "5") @PathVariable Long[] ids) {
+        try {
+            log.info("开始彻底删除用水户数据，ids: {}", (Object) ids);
+            boolean result = waterUserInfoService.deleteByIdsPhysically(List.of(ids));
+            return result
+                    ? AjaxResult.success("彻底删除成功，共删除 " + ids.length + " 条数据")
+                    : AjaxResult.error("彻底删除失败");
+        } catch (Exception e) {
+            log.error("彻底删除数据异常", e);
+            return AjaxResult.error("彻底删除失败：" + e.getMessage());
+        }
+    }
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterUserInfo/domain/WaterUserInfo.java

@@ -0,0 +1,175 @@
+package com.zksy.WaterSupply.WaterUserInfo.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 用水户信息实体
+ */
+@Data
+@TableName("water_user_info")
+@ApiModel(
+        value = "WaterUserInfo",
+        description = "用水户信息对象，包含用水户基础属性"
+)
+public class WaterUserInfo {
+
+    @ApiModelProperty(
+            value = "主键ID",
+            example = "0",
+            position = 1,
+            notes = "数据库自增主键，新增时不需要传入"
+    )
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(
+            value = "用户编号",
+            example = "USER_XX",
+            required = true,
+            position = 2
+    )
+    private String userCode;
+
+    @ApiModelProperty(
+            value = "用户名称",
+            example = "XX用户",
+            required = true,
+            position = 3
+    )
+    private String userName;
+
+    @ApiModelProperty(
+            value = "用户类型",
+            example = "居民",
+            position = 4,
+            notes = "居民/工业/商业/行政事业"
+    )
+    private String userType;
+
+    @ApiModelProperty(
+            value = "用水地址",
+            example = "XX小区XX栋XX单元XX室",
+            position = 5
+    )
+    private String address;
+
+    @ApiModelProperty(
+            value = "联系人",
+            example = "XX",
+            position = 6
+    )
+    private String contactPerson;
+
+    @ApiModelProperty(
+            value = "联系电话",
+            example = "13800138000",
+            position = 7
+    )
+    private String contactPhone;
+
+    @ApiModelProperty(
+            value = "水表编号",
+            example = "METER_XX",
+            position = 8
+    )
+    private String meterNumber;
+
+    @ApiModelProperty(
+            value = "初始读数",
+            example = "0.00",
+            position = 9,
+            notes = "单位：立方米(m³)"
+    )
+    private BigDecimal initialReading;
+
+    @ApiModelProperty(
+            value = "当前读数",
+            example = "125.50",
+            position = 10,
+            notes = "单位：立方米(m³)"
+    )
+    private BigDecimal currentReading;
+
+    @ApiModelProperty(
+            value = "年用水量",
+            example = "180.00",
+            position = 11,
+            notes = "单位：立方米(m³)"
+    )
+    private BigDecimal annualWaterConsumption;
+
+    @ApiModelProperty(
+            value = "用户状态",
+            example = "0",
+            allowableValues = "0,1,2",
+            position = 12,
+            notes = "0正常 1欠费 2停用"
+    )
+    private String status;
+
+    @ApiModelProperty(
+            value = "备注",
+            example = "XX区域重要用水户",
+            position = 13
+    )
+    private String remark;
+
+    @ApiModelProperty(
+            value = "删除标志",
+            example = "0",
+            allowableValues = "0,2",
+            hidden = true,
+            position = 14
+    )
+    @TableLogic
+    private String delFlag;
+
+    @ApiModelProperty(
+            value = "创建者",
+            example = "admin",
+            hidden = true,
+            position = 15
+    )
+    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(
+            value = "创建时间",
+            example = "2025-01-01 00:00:00",
+            hidden = true,
+            position = 16
+    )
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(
+            value = "更新者",
+            example = "admin",
+            hidden = true,
+            position = 17
+    )
+    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.UPDATE)
+    private String updateBy;
+
+    @ApiModelProperty(
+            value = "更新时间",
+            example = "2025-01-01 00:00:00",
+            hidden = true,
+            position = 18
+    )
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterUserInfo/mapper/WaterUserInfoMapper.java

@@ -0,0 +1,29 @@
+package com.zksy.WaterSupply.WaterUserInfo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.WaterSupply.WaterUserInfo.domain.WaterUserInfo;
+import org.apache.ibatis.annotations.Param;
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface WaterUserInfoMapper extends BaseMapper<WaterUserInfo> {
+
+    List<WaterUserInfo> selectUserList(
+            @Param("userCode") String userCode,
+            @Param("userName") String userName,
+            @Param("status") String status,
+            @Param("userType") String userType,
+            @Param("startTime") LocalDateTime startTime,
+            @Param("endTime") LocalDateTime endTime);
+
+    List<WaterUserInfo> selectDeletedList(
+            @Param("userCode") String userCode,
+            @Param("userName") String userName,
+            @Param("status") String status,
+            @Param("startTime") LocalDateTime startTime,
+            @Param("endTime") LocalDateTime endTime);
+
+    int restoreByIds(@Param("ids") List<Long> ids, @Param("updateBy") String updateBy);
+
+    int deleteByIdsPhysically(@Param("ids") List<Long> ids);
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterUserInfo/service/IWaterUserInfoService.java

@@ -0,0 +1,30 @@
+package com.zksy.WaterSupply.WaterUserInfo.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.WaterSupply.WaterUserInfo.domain.WaterUserInfo;
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface IWaterUserInfoService extends IService<WaterUserInfo> {
+
+    IPage<WaterUserInfo> queryPage(Page<WaterUserInfo> page,
+                                   String userCode,
+                                   String userName,
+                                   String status,
+                                   String userType,
+                                   LocalDateTime startTime,
+                                   LocalDateTime endTime);
+
+    IPage<WaterUserInfo> queryDeletedPage(Page<WaterUserInfo> page,
+                                          String userCode,
+                                          String userName,
+                                          String status,
+                                          LocalDateTime startTime,
+                                          LocalDateTime endTime);
+
+    boolean restoreByIds(List<Long> ids, String updateBy);
+
+    boolean deleteByIdsPhysically(List<Long> ids);
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/WaterSupply/WaterUserInfo/service/impl/WaterUserInfoServiceImpl.java

@@ -0,0 +1,55 @@
+package com.zksy.WaterSupply.WaterUserInfo.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.WaterSupply.WaterUserInfo.domain.WaterUserInfo;
+import com.zksy.WaterSupply.WaterUserInfo.mapper.WaterUserInfoMapper;
+import com.zksy.WaterSupply.WaterUserInfo.service.IWaterUserInfoService;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class WaterUserInfoServiceImpl extends ServiceImpl<WaterUserInfoMapper, WaterUserInfo>
+        implements IWaterUserInfoService {
+
+    @Override
+    public IPage<WaterUserInfo> queryPage(Page<WaterUserInfo> page,
+                                          String userCode,
+                                          String userName,
+                                          String status,
+                                          String userType,
+                                          LocalDateTime startTime,
+                                          LocalDateTime endTime) {
+        List<WaterUserInfo> list = baseMapper.selectUserList(userCode, userName, status, userType, startTime, endTime);
+        page.setRecords(list);
+        page.setTotal(list.size());
+        return page;
+    }
+
+    @Override
+    public IPage<WaterUserInfo> queryDeletedPage(Page<WaterUserInfo> page,
+                                                 String userCode,
+                                                 String userName,
+                                                 String status,
+                                                 LocalDateTime startTime,
+                                                 LocalDateTime endTime) {
+        List<WaterUserInfo> list = baseMapper.selectDeletedList(userCode, userName, status, startTime, endTime);
+        page.setRecords(list);
+        page.setTotal(list.size());
+        return page;
+    }
+
+    @Override
+    public boolean restoreByIds(List<Long> ids, String updateBy) {
+        if (ids == null || ids.isEmpty()) return false;
+        return baseMapper.restoreByIds(ids, updateBy) > 0;
+    }
+
+    @Override
+    public boolean deleteByIdsPhysically(List<Long> ids) {
+        if (ids == null || ids.isEmpty()) return false;
+        return baseMapper.deleteByIdsPhysically(ids) > 0;
+    }
+}

pipe-network-service/zksy-system/src/main/resources/mapper/WaterSupply/WaterUserInfo/WaterUserInfoMapper.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.WaterSupply.WaterUserInfo.mapper.WaterUserInfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.WaterSupply.WaterUserInfo.domain.WaterUserInfo">
+        <id column="id" property="id"/>
+        <result column="user_code" property="userCode"/>
+        <result column="user_name" property="userName"/>
+        <result column="user_type" property="userType"/>
+        <result column="address" property="address"/>
+        <result column="contact_person" property="contactPerson"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="meter_number" property="meterNumber"/>
+        <result column="initial_reading" property="initialReading"/>
+        <result column="current_reading" property="currentReading"/>
+        <result column="annual_water_consumption" property="annualWaterConsumption"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, user_code, user_name, user_type, address, contact_person, contact_phone,
+        meter_number, initial_reading, current_reading, annual_water_consumption,
+        status, remark, del_flag, create_by, create_time, update_by, update_time
+    </sql>
+
+    <select id="selectUserList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM water_user_info
+        WHERE del_flag = '0'
+        <if test="userCode != null and userCode != ''">
+            AND user_code LIKE CONCAT('%', #{userCode}, '%')
+        </if>
+        <if test="userName != null and userName != ''">
+            AND user_name LIKE CONCAT('%', #{userName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND status = #{status}
+        </if>
+        <if test="userType != null and userType != ''">
+            AND user_type = #{userType}
+        </if>
+        <if test="startTime != null">
+            AND create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND create_time &lt;= #{endTime}
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+    <select id="selectDeletedList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM water_user_info
+        WHERE del_flag = '2'
+        <if test="userCode != null and userCode != ''">
+            AND user_code LIKE CONCAT('%', #{userCode}, '%')
+        </if>
+        <if test="userName != null and userName != ''">
+            AND user_name LIKE CONCAT('%', #{userName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND status = #{status}
+        </if>
+        <if test="startTime != null">
+            AND update_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND update_time &lt;= #{endTime}
+        </if>
+        ORDER BY update_time DESC
+    </select>
+
+    <update id="restoreByIds">
+        UPDATE water_user_info
+        SET del_flag = '0',
+        update_by = #{updateBy},
+        update_time = NOW()
+        WHERE id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <delete id="deleteByIdsPhysically">
+        DELETE FROM water_user_info WHERE id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>