diff --git a/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java b/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java index 4cdf698..da7ff67 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java @@ -2,20 +2,11 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.dto.StDamDto; -import com.gunshi.project.xyt.entity.dto.StEqptDto; -import com.gunshi.project.xyt.entity.dto.StResDto; -import com.gunshi.project.xyt.entity.dto.StRvDto; +import com.gunshi.project.xyt.entity.dto.*; import com.gunshi.project.xyt.entity.vo.StResVo; -import com.gunshi.project.xyt.model.StDamB; -import com.gunshi.project.xyt.model.StEqptB; -import com.gunshi.project.xyt.model.StResB; -import com.gunshi.project.xyt.model.StRvB; +import com.gunshi.project.xyt.model.*; import com.gunshi.project.xyt.service.EngineeringDrainageService; -import com.gunshi.project.xyt.so.StDamPageSo; -import com.gunshi.project.xyt.so.StEqptPageSo; -import com.gunshi.project.xyt.so.StResPageSo; -import com.gunshi.project.xyt.so.StRvPageSo; +import com.gunshi.project.xyt.so.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -124,6 +115,34 @@ public class EngineeringDrainageController { return R.ok(engineeringDrainageService.pageStDam(stDamPageSo)); } + @Operation(summary = "新增闸阀基础信息") + @PostMapping("/insertStGate") + public R insertStGate(@RequestBody @Validated StGateDto stGateDto){ + engineeringDrainageService.insertStGate(stGateDto); + return R.ok(); + } + + @Operation(summary = "更新闸阀基础信息") + @PostMapping("/updateStGate") + public R updateStGate(@RequestBody @Validated StGateB stGateB){ + engineeringDrainageService.updateStGate(stGateB); + return R.ok(); + } + + @Operation(summary = "根据闸阀ID删除闸阀基础信息") + @GetMapping("/deleteStGate") + public R deleteStGate(@Parameter(description = "闸阀ID") @RequestParam("gateId") String gateId){ + engineeringDrainageService.deleteStGate(gateId); + return R.ok(); + } + + @Operation(summary = "分页查询闸阀基础信息") + @PostMapping("/updateStGate") + public R> pageStGate(@RequestBody @Validated StGatePageSo stGatePageSo){ + return R.ok(engineeringDrainageService.pageStGate(stGatePageSo)); + } + + @Operation(summary = "新增量水堰基础信息") @PostMapping("/insertStEqpt") public R insertStEqpt(@RequestBody @Validated StEqptDto stEqptDto){ diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateController.java b/src/main/java/com/gunshi/project/xyt/controller/GateController.java new file mode 100644 index 0000000..ea9f890 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/GateController.java @@ -0,0 +1,53 @@ +package com.gunshi.project.xyt.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; +import com.gunshi.project.xyt.model.StWaterQualityR; +import com.gunshi.project.xyt.service.GateService; +import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.so.GateHistoryPageSo; +import com.gunshi.project.xyt.so.WaterQualityPageSo; +import com.gunshi.project.xyt.validate.markers.QueryPage; +import com.gunshi.project.xyt.validate.markers.QueryTimeRange; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 闸阀接口 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@RestController +@Slf4j +@Tag(name = "闸阀接口-controller", description = "闸阀接口") +@Data +@RequestMapping("/gate") +public class GateController { + + @Resource + private GateService gateService; + + @Operation(summary = "闸阀列表") + @GetMapping("/list") + public R> list() { + return R.ok(gateService.queryGateList()); + } + + @Operation(summary = "闸阀开关历史分页查询") + @PostMapping("/page") + public R> page(@Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true) + GateHistoryPageSo gateHistoryPageSo) { + return R.ok(gateService.page(gateHistoryPageSo)); + } + +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java b/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java new file mode 100644 index 0000000..37024ab --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java @@ -0,0 +1,72 @@ +package com.gunshi.project.xyt.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.addressbook.entity.so.UamsOrgPageSo; +import com.gunshi.addressbook.entity.vo.UamsOrgFullInfoVo; +import com.gunshi.addressbook.model.UamsOrgB; +import com.gunshi.core.result.R; +import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; +import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; +import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; +import com.gunshi.project.xyt.service.GateRepairRecordService; +import com.gunshi.project.xyt.so.GateRepairRecordPageSo; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * 闸阀检修接口 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@RestController +@Slf4j +@Tag(name = "闸阀检修接口-controller", description = "闸阀检修接口") +@Data +@RequestMapping("/gate/repair") +public class GateRepairRecordController { + + @Resource + private GateRepairRecordService gateRepairRecordService; + + @Operation(summary = "新增检修记录") + @PostMapping("/add") + public R add(@Validated(Insert.class) @RequestBody StGateRepairRecordDto stGateRepairRecordDto) { + return R.ok(gateRepairRecordService.addRecord(stGateRepairRecordDto)); + } + + @Operation(summary = "更新检修记录") + @PostMapping("/update") + public R update(@RequestBody @Validated(Update.class) StGateRepairRecordDto stGateRepairRecordDto) { + return R.ok(gateRepairRecordService.updateRecord(stGateRepairRecordDto)); + } + + @Operation(summary = "检修记录详情") + @GetMapping("/detail") + public R detail(@RequestParam("recordId") Long recordId) { + return R.ok(gateRepairRecordService.detail(recordId)); + } + + @Operation(summary = "根据recordId删除检修记录") + @Parameter(name = "recordId", description = "检修记录id") + @DeleteMapping("/delete") + public R delete(@RequestParam("recordId") Long recordId){ + return R.ok(gateRepairRecordService.deleteRecord(recordId)); + } + + @Operation(summary = "分页查询") + @PostMapping("/page") + public R> page(@RequestBody @Validated GateRepairRecordPageSo gateRepairRecordPageSo) { + return R.ok(gateRepairRecordService.page(gateRepairRecordPageSo)); + } + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java new file mode 100644 index 0000000..8d656fd --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java @@ -0,0 +1,23 @@ +package com.gunshi.project.xyt.entity.dto; + +import com.gunshi.project.xyt.model.StGateRepairDetail; +import com.gunshi.project.xyt.model.StGateRepairRecord; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * Description: + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class StGateRepairRecordDto extends StGateRepairRecord { + + @Schema(description="维修情况") + private List repairDetails; + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java new file mode 100644 index 0000000..93324b9 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java @@ -0,0 +1,22 @@ +package com.gunshi.project.xyt.entity.vo; + +import com.gunshi.project.xyt.model.StGateBHistory; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +/** + * 闸门开关历史信息 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class GateHistoryInfoVo extends StGateBHistory { + + + @Schema(description = "闸阀名称") + private String gateNm; + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java new file mode 100644 index 0000000..b73ced8 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java @@ -0,0 +1,32 @@ +package com.gunshi.project.xyt.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * 闸门详细信息 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class GateInfoVo { + + @Schema(description = "闸阀ID") + private Long gateId; + + @Schema(description = "闸阀名称") + private String gateNm; + + @Schema(description = "开关状态 1：全开 2：50%开 3：关") + private Integer status; + + @Schema(description="数据采集时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date tm; + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java new file mode 100644 index 0000000..2a4488d --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java @@ -0,0 +1,23 @@ +package com.gunshi.project.xyt.entity.vo; + +import com.gunshi.project.xyt.model.StGateRepairDetail; +import com.gunshi.project.xyt.model.StGateRepairRecord; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 闸门检修详细信息 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class GateRepairDetailVo extends StGateRepairRecord { + + @Schema(description = "详细信息") + private List details; + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java new file mode 100644 index 0000000..c366391 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java @@ -0,0 +1,20 @@ +package com.gunshi.project.xyt.entity.vo; + +import com.gunshi.project.xyt.model.StGateRepairRecord; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 闸门详细信息 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class GateRepairRecordVo extends StGateRepairRecord { + + @Schema(description = "闸阀名称") + private String gateNm; + +} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java index b6ed0a9..3d0a3ee 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java @@ -1,12 +1,21 @@ package com.gunshi.project.xyt.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.db.dao.IMapper; +import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; import com.gunshi.project.xyt.model.StGateB; import java.util.List; + +import com.gunshi.project.xyt.entity.vo.GateInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @Mapper -public interface StGateBMapper extends BaseMapper { +public interface StGateBMapper extends IMapper { int batchInsert(@Param("list") List list); + + + List queryGateList(); + + Page gateHistory(Page page,@Param("gateId") Long gateId,@Param("startTime") String startTime,@Param("endTime") String endTime); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java new file mode 100644 index 0000000..921cd60 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java @@ -0,0 +1,19 @@ +package com.gunshi.project.xyt.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.db.dao.IMapper; +import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; +import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; +import com.gunshi.project.xyt.model.StGateB; +import com.gunshi.project.xyt.model.StGateRepairRecord; +import com.gunshi.project.xyt.so.GateRepairRecordPageSo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface StGateRepairRecordMapper extends IMapper { + Page page(Page page,@Param("param") GateRepairRecordPageSo gateRepairRecordPageSo,@Param("startTime") String startTime,@Param("endTime") String endTime); +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StFlowR.java b/src/main/java/com/gunshi/project/xyt/model/StFlowR.java index 6d1a31a..3251f8f 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StFlowR.java +++ b/src/main/java/com/gunshi/project/xyt/model/StFlowR.java @@ -7,5 +7,49 @@ package com.gunshi.project.xyt.model; * @version 1.0.0 * @since 2024-01-25 */ -public class StFlowR { + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 流量计基本信息表 + */ +@Schema(description="流量计基本信息表") +@Data +@TableName(value = "dbo.ST_FLOW_R") +public class StFlowR implements Serializable { + + /** + * 流量计ID + */ + @TableId(value = "FLOW_ID", type = IdType.INPUT) + @Schema(description="流量计ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long flowId; + + /** + * 流量计名称 + */ + @TableField(value = "FLOW_NM") + @Schema(description="流量计名称") + private String flowNm; + + /** + * 修改时间 + */ + @TableField(value = "TM") + @Schema(description="修改时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date tm; + } diff --git a/src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java b/src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java new file mode 100644 index 0000000..1680dfa --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java @@ -0,0 +1,55 @@ +package com.gunshi.project.xyt.model; + +/** + * 流量数据 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 流量数据表 + */ +@Schema(description="流量数据表") +@Data +@TableName(value = "dbo.ST_FLOW_R_REAL") +public class StFlowRReal implements Serializable { + + /** + * 流量计ID + */ + @TableId(value = "FLOW_ID", type = IdType.INPUT) + @Schema(description="流量计ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long flowId; + + /** + * 实时流量 + */ + @TableField(value = "REAL_DATA") + @Schema(description="实时流量") + private Float realData; + + /** + * 数据采集时间 + */ + @TableField(value = "TM") + @Schema(description="数据采集时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date tm; + +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java b/src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java new file mode 100644 index 0000000..b6ca1f4 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java @@ -0,0 +1,64 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 闸阀开关历史表 + */ +@Schema(description="闸阀开关历史表") +@Data +@TableName(value = "dbo.ST_GATE_B_HISTORY") +public class StGateBHistory implements Serializable { + + /** + * 历史ID + */ + @TableId(value = "HISTORY_ID", type = IdType.INPUT) + @Schema(description="历史ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long historyId; + + + /** + * 闸阀ID + */ + @TableId(value = "GATE_ID") + @Schema(description="闸阀ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long gateId; + + + /** + * 开关状态 1：全开 2：50%开 3：关 + */ + @TableField(value = "[STATUS]") + @Schema(description="开关状态 1：全开 2：50%开 3：关") + private Integer status; + + /** + * 数据采集时间时间 + */ + @TableField(value = "TM") + @Schema(description="数据采集时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date tm; + + public static final String COL_HISTORY_ID = "HISTORY_ID"; + + public static final String COL_GATE_ID = "GATE_ID"; + + public static final String COL_STATUS = "STATUS"; + + public static final String COL_TM = "TM"; +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateBReal.java b/src/main/java/com/gunshi/project/xyt/model/StGateBReal.java new file mode 100644 index 0000000..16e2e9a --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StGateBReal.java @@ -0,0 +1,55 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 闸阀数据信息表 + */ +@Schema(description="闸阀数据信息表") +@Data +@TableName(value = "dbo.ST_GATE_B_REAL") +public class StGateBReal implements Serializable { + + + /** + * 闸阀ID + */ + @TableId(value = "GATE_ID", type = IdType.INPUT) + @Schema(description="闸阀ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long gateId; + + + /** + * 开关状态 1：全开 2：50%开 3：关 + */ + @TableField(value = "[STATUS]") + @Schema(description="开关状态 1：全开 2：50%开 3：关") + private Integer status; + + /** + * 数据采集时间时间 + */ + @TableField(value = "TM") + @Schema(description="数据采集时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date tm; + + public static final String COL_GATE_ID = "GATE_ID"; + + public static final String COL_STATUS = "STATUS"; + + public static final String COL_TM = "TM"; +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java b/src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java new file mode 100644 index 0000000..77ee560 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java @@ -0,0 +1,109 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 闸阀维修详情表 + */ +@Schema(description="闸阀维修详情表") +@Data +@TableName(value = "dbo.ST_GATE_REPAIR_DETAIL") +public class StGateRepairDetail implements Serializable { + + /** + * 维修详情ID + */ + @TableId(value = "DETAIL_ID", type = IdType.INPUT) + @Schema(description="维修详情ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long detailId; + + /** + * 维修记录ID + */ + @TableId(value = "RECORD_ID") + @Schema(description="维修记录ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long recordId; + + /** + * 闸阀ID + */ + @TableId(value = "GATE_ID") + @Schema(description="闸阀ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long gateId; + + /** + * 闸阀名称 + */ + @TableField(value = "GATE_NM") + @Schema(description="闸阀名称") + private String gateNm; + + /** + * 检修内容 + */ + @TableField(value = "REPAIR_CONTENT") + @Schema(description="检修内容") + private String repairContent; + + /** + * 存在的问题 + */ + @TableField(value = "PROBLEM") + @Schema(description="存在的问题") + private String problem; + + /** + * 原因及意见 + */ + @TableField(value = "REASON_AND_SUGGESTION") + @Schema(description="原因及意见") + private String reasonAndSuggestion; + + /** + * 处理结果 + */ + @TableField(value = "DEAL_RESULT") + @Schema(description="处理结果") + private String dealResult; + + /** + * 下一次检修时间 + */ + @TableField(value = "NEXT_REPAIR_TM") + @Schema(description="下一次检修时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date nextRepairTm; + + public static final String COL_DETAIL_ID = "DETAIL_ID"; + + public static final String COL_RECORD_ID = "RECORD_ID"; + + public static final String COL_GATE_ID = "GATE_ID"; + + public static final String COL_GATE_NM = "GATE_NM"; + + public static final String COL_REPAIR_CONTENT = "REPAIR_CONTENT"; + + public static final String COL_PROBLEM = "PROBLEM"; + + public static final String COL_REASON_AND_SUGGESTION = "REASON_AND_SUGGESTION"; + + public static final String COL_DEAL_RESULT = "DEAL_RESULT"; + + public static final String COL_NEXT_REPAIR_TM = "NEXT_REPAIR_TM"; + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java b/src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java new file mode 100644 index 0000000..6dd2a0d --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java @@ -0,0 +1,78 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 闸阀基本信息表 + */ +@Schema(description="闸阀维修记录表") +@Data +@TableName(value = "dbo.ST_GATE_REPAIR_RECORD") +public class StGateRepairRecord implements Serializable { + /** + * 维修记录ID + */ + @TableId(value = "RECORD_ID", type = IdType.INPUT) + @Schema(description="维修记录ID") + @JsonSerialize(using = ToStringSerializer.class) + @NotNull(message = "维修记录ID不能为空", groups = {Update.class}) + private Long recordId; + + /** + * 维修类型，0维修1养护 + */ + @TableField(value = "REPAIR_TYPE") + @Schema(description="维修类型，0维修1养护") + @NotNull(message = "维修类型不能为空", groups = {Insert.class,Update.class}) + private Integer repairType; + + /** + * 记录人ID + */ + @TableField(value = "RECORD_USER_ID") + @Schema(description="记录人ID") + private Long recordUserId; + + /** + * 记录人 + */ + @TableField(value = "RECORD_USER_NAME") + @Schema(description="记录人") + @NotEmpty(message = "记录人不能为空", groups = {Insert.class,Update.class}) + private String recordUserName; + + /** + * 检修时间 + */ + @TableField(value = "REPAIR_TM") + @Schema(description="检修时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @NotNull(message = "检修时间不能为空", groups = {Insert.class,Update.class}) + private Date repairTm; + + public static final String COL_RECORD_ID = "RECORD_ID"; + + public static final String COL_REPAIR_TYPE = "REPAIR_TYPE"; + + public static final String COL_RECORD_USER_ID = "RECORD_USER_ID"; + + public static final String COL_RECORD_USER_NAME = "RECORD_USER_NAME"; + + public static final String COL_REPAIR_TM = "REPAIR_TM"; + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java b/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java index a4fa261..de01ecc 100644 --- a/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java +++ b/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.dto.*; -import com.gunshi.project.xyt.entity.vo.StResVo; import com.gunshi.project.xyt.model.*; import com.gunshi.project.xyt.model.StDamBAutoDao; import com.gunshi.project.xyt.model.StEqptBAutoDao; @@ -16,10 +15,7 @@ import com.gunshi.project.xyt.model.StGateBAutoDao; import com.gunshi.project.xyt.model.StResBAutoDao; import com.gunshi.project.xyt.model.StResStcdRefAutoDao; import com.gunshi.project.xyt.model.StRvBAutoDao; -import com.gunshi.project.xyt.so.StDamPageSo; -import com.gunshi.project.xyt.so.StEqptPageSo; -import com.gunshi.project.xyt.so.StResPageSo; -import com.gunshi.project.xyt.so.StRvPageSo; +import com.gunshi.project.xyt.so.*; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -344,8 +340,15 @@ public class EngineeringDrainageService { * @param stGateDto 闸阀基础信息DTO */ public void insertStGate(StGateDto stGateDto){ - - + if (queryByGateCode(stGateDto.getGateCd()) != null){ + throw new IllegalArgumentException("闸阀编码必须唯一"); + } + StGateB stGateB = new StGateB(); + BeanUtil.copyProperties(stGateDto,stGateB); + long gateId = IdWorker.getId(); + stGateB.setGateId(gateId); + stGateB.setTm(new Date()); + stGateBAutoDao.save(stGateB); } /** @@ -353,7 +356,13 @@ public class EngineeringDrainageService { * @param stGateB 闸阀基础信息 */ public void updateStGate(StGateB stGateB){ - + Long gateId = stGateB.getGateId(); + StGateB byId = stGateBAutoDao.getById(gateId); + if (byId == null){ + throw new IllegalArgumentException("闸阀ID : " + gateId + "不存在"); + } + stGateB.setTm(new Date()); + stGateBAutoDao.updateById(stGateB); } /** @@ -374,6 +383,45 @@ public class EngineeringDrainageService { stGateBAutoDao.update(updateWrapper); } + /** + * 根据闸阀编码查询闸阀基础信息 + * @param gateCd 闸阀编码 + * @return 闸阀基础信息 + */ + public StGateB queryByGateCode(String gateCd){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StGateB.COL_GATE_CD,gateCd) + .eq(StGateB.COL_STATUS,1); + return stGateBAutoDao.getOne(queryWrapper); + } + + /** + * 分页查询闸阀基础信息 + * @param stGatePageSo 闸阀基本信息查询参数 + * @return + */ + public Page pageStGate(StGatePageSo stGatePageSo){ + if (StringUtils.isNotEmpty(stGatePageSo.getGateId())){ + StGateB stGateB = stGateBAutoDao.getById(stGatePageSo.getGateId()); + if (stGateB == null){ + return null; + } + List gateBList = List.of(stGateB); + return new Page(1,1,1).setRecords(gateBList); + } + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(stGatePageSo.getGateNm())){ + lambdaQueryWrapper.like(StringUtils.isNotEmpty(stGatePageSo.getGateNm()),StGateB::getGateNm,stGatePageSo.getGateNm()); + } + if (StringUtils.isNotEmpty(stGatePageSo.getGateCd())){ + lambdaQueryWrapper.like(StringUtils.isNotEmpty(stGatePageSo.getGateCd()),StGateB::getGateCd,stGatePageSo.getGateCd()); + } + if (stGatePageSo.getStatus() != null){ + lambdaQueryWrapper.eq(StGateB::getStatus,stGatePageSo.getStatus()); + } + return stGateBAutoDao.page(stGatePageSo.getPageSo().toPage(),lambdaQueryWrapper); + } + /** * 新增量水堰基础信息 * @param stEqptDto 量水堰基础信息DTO diff --git a/src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java b/src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java new file mode 100644 index 0000000..02e3778 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java @@ -0,0 +1,52 @@ +package com.gunshi.project.xyt.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; +import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; +import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; +import com.gunshi.project.xyt.so.GateRepairRecordPageSo; + +/** + * Description: + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +public interface GateRepairRecordService { + + /** + * 新增检修记录 + * @param stGateRepairRecordDto + * @return + */ + String addRecord(StGateRepairRecordDto stGateRepairRecordDto); + + /** + * 更新检修记录 + * @param stGateRepairRecordDto + * @return + */ + String updateRecord(StGateRepairRecordDto stGateRepairRecordDto); + + /** + * 根据recordId删除检修记录 + * @param recordId 检修记录id + * @return + */ + String deleteRecord(Long recordId); + + /** + * 分页查询 + * @param gateRepairRecordPageSo + * @return + */ + Page page(GateRepairRecordPageSo gateRepairRecordPageSo); + + /** + * 检修记录详情 + * @param recordId 检修记录id + * @return + */ + GateRepairDetailVo detail(Long recordId); +} diff --git a/src/main/java/com/gunshi/project/xyt/service/GateService.java b/src/main/java/com/gunshi/project/xyt/service/GateService.java new file mode 100644 index 0000000..e79c644 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/GateService.java @@ -0,0 +1,31 @@ +package com.gunshi.project.xyt.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; +import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.so.GateHistoryPageSo; + +import java.util.List; + +/** + * Description: + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +public interface GateService { + + /** + * 闸阀列表 + * @return + */ + List queryGateList(); + + /** + * 闸阀开关历史分页查询 + * @param gateHistoryPageSo 查询参数 + * @return + */ + Page page(GateHistoryPageSo gateHistoryPageSo); +} diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java new file mode 100644 index 0000000..d37a7d5 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java @@ -0,0 +1,136 @@ +package com.gunshi.project.xyt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.gunshi.db.dao.BaseOrderDao; +import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; +import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; +import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; +import com.gunshi.project.xyt.mapper.StGateRepairRecordMapper; +import com.gunshi.project.xyt.model.StGateRepairDetail; +import com.gunshi.project.xyt.model.StGateRepairRecord; +import com.gunshi.project.xyt.service.GateRepairRecordService; +import com.gunshi.project.xyt.so.GateRepairRecordPageSo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Description: + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@EqualsAndHashCode(callSuper = true) +@Service +@Data +@Transactional(rollbackFor = Exception.class) +@Slf4j +public class GateRepairRecordServiceImpl extends BaseOrderDao implements GateRepairRecordService { + + private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + @Autowired + private StGateRepairRecordMapper stGateRepairRecordMapper; + + @Override + public String addRecord(StGateRepairRecordDto stGateRepairRecordDto) { + StGateRepairRecord repairRecord = new StGateRepairRecord(); + BeanUtils.copyProperties(stGateRepairRecordDto, repairRecord); + long id = IdWorker.getId(); + repairRecord.setRecordId(id); + List repairDetails = stGateRepairRecordDto.getRepairDetails(); + Boolean relFlag = insertRecordDetail(id,repairDetails); + Boolean flag = super.save(repairRecord); + if (flag && relFlag) { + return "添加成功"; + } + return "添加失败"; + } + + @Override + public String updateRecord(StGateRepairRecordDto stGateRepairRecordDto) { + Long recordId = stGateRepairRecordDto.getRecordId(); + StGateRepairRecord one = super.getById(recordId); + if (one == null) { + throw new IllegalArgumentException("不存在的检修记录"); + } + BeanUtils.copyProperties(stGateRepairRecordDto, one); + super.updateById(one); + //先删除检修记录详情 + deleteRecordDetail(recordId); + insertRecordDetail(recordId,stGateRepairRecordDto.getRepairDetails()); + return "更新成功"; + } + + @Override + public String deleteRecord(Long recordId) { + StGateRepairRecord one = super.getById(recordId); + if (one == null) { + throw new IllegalArgumentException("不存在的检修记录"); + } + deleteRecordDetail(recordId); + super.removeById(recordId); + return "删除成功"; + } + + @Override + public Page page(GateRepairRecordPageSo gateRepairRecordPageSo) { + DateTimeRangeSo timeSo = gateRepairRecordPageSo.getTimeSo(); + Date start = timeSo.getStart(); + Date end = timeSo.getEnd(); + String startTime = sdf.format(start); + String endTime = sdf.format(end); + return stGateRepairRecordMapper.page(gateRepairRecordPageSo.getPageSo().toPage(),gateRepairRecordPageSo,startTime,endTime); + } + + @Override + public GateRepairDetailVo detail(Long recordId) { + GateRepairDetailVo vo = new GateRepairDetailVo(); + StGateRepairRecord one = super.getById(recordId); + if (one == null) { + throw new IllegalArgumentException("不存在的检修记录"); + } + BeanUtils.copyProperties(one, vo); + vo.setDetails(queryRecordDetail(recordId)); + return vo; + } + + private List queryRecordDetail(Long recordId) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(StGateRepairDetail.class) + .eq(StGateRepairDetail::getRecordId, recordId); + return Db.list(query); + } + + private void deleteRecordDetail(Long recordId) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(StGateRepairDetail.class) + .eq(StGateRepairDetail::getRecordId, recordId); + Db.remove(query); + } + + private Boolean insertRecordDetail(long id,List repairDetails) { + if (CollectionUtils.isNotEmpty(repairDetails)) { + List details = repairDetails.stream().map(detail -> { + detail.setRecordId(id); + return detail; + }).collect(Collectors.toList()); + return Db.saveBatch(details); + } + return true; + } +} diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java new file mode 100644 index 0000000..4be5ebf --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java @@ -0,0 +1,58 @@ +package com.gunshi.project.xyt.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.db.dao.BaseOrderDao; +import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; +import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.mapper.StGateBMapper; +import com.gunshi.project.xyt.model.StGateB; +import com.gunshi.project.xyt.service.GateService; +import com.gunshi.project.xyt.so.GateHistoryPageSo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +/** + * Description: + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@EqualsAndHashCode(callSuper = true) +@Service +@Data +@Transactional(rollbackFor = Exception.class) +@Slf4j +public class GateServiceImpl extends BaseOrderDao implements GateService { + + private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + @Autowired + private StGateBMapper stGateBMapper; + + @Override + public List queryGateList() { + return stGateBMapper.queryGateList(); + } + + @Override + public Page page(GateHistoryPageSo gateHistoryPageSo) { + + DateTimeRangeSo timeSo = gateHistoryPageSo.getTimeSo(); + Date start = timeSo.getStart(); + Date end = timeSo.getEnd(); + String startTime = sdf.format(start); + String endTime = sdf.format(end); + + return stGateBMapper.gateHistory(gateHistoryPageSo.getPageSo().toPage(),gateHistoryPageSo.getGateId(),startTime,endTime); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java b/src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java new file mode 100644 index 0000000..e97951c --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java @@ -0,0 +1,32 @@ +package com.gunshi.project.xyt.so; + +import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.db.dto.PageSo; +import com.gunshi.project.xyt.validate.markers.QueryPage; +import com.gunshi.project.xyt.validate.markers.QueryTimeRange; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 闸阀开关历史查询参数 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class GateHistoryPageSo { + + @Schema(description = "闸阀ID") + @NotNull(message = "闸阀ID不能为空") + private Long gateId; + + @Schema(description = "分页参数") + @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) + private PageSo pageSo; + + @Schema(description = "时间范围") + @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) + private DateTimeRangeSo timeSo; +} diff --git a/src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java b/src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java new file mode 100644 index 0000000..53d2a86 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java @@ -0,0 +1,34 @@ +package com.gunshi.project.xyt.so; + +import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.db.dto.PageSo; +import com.gunshi.project.xyt.validate.markers.QueryPage; +import com.gunshi.project.xyt.validate.markers.QueryTimeRange; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 闸阀开关历史查询参数 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class GateRepairRecordPageSo { + + @Schema(description = "分页参数") + @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) + private PageSo pageSo; + + @Schema(description = "闸阀名称") + private String gateNm; + + @Schema(description = "时间范围") + @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) + private DateTimeRangeSo timeSo; + + @Schema(description="维修类型，0维修1养护") + private Integer repairType; +} diff --git a/src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java b/src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java new file mode 100644 index 0000000..aa09168 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java @@ -0,0 +1,37 @@ +package com.gunshi.project.xyt.so; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.gunshi.db.dto.PageSo; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * TODO + * + * @ClassName StGatePageSo + * @Author Huang Qianxiang + * @Date 2024/1/26 17:06 + */ +@Data +@Schema(description = "闸阀基本信息查询参数") +public class StGatePageSo { + + @NotNull(message = "分页参数不能为空") + private PageSo pageSo; + + @Schema(description="闸阀ID") + private String gateId; + + @Schema(description="闸阀编码") + private String gateCd; + + @Schema(description="闸阀名称") + private String gateNm; + + @Schema(description="状态 1：启用 0：禁用") + private Integer status; + +} diff --git a/src/main/resources/mapper/StGateBMapper.xml b/src/main/resources/mapper/StGateBMapper.xml index 97b7caf..1d8cda2 100644 --- a/src/main/resources/mapper/StGateBMapper.xml +++ b/src/main/resources/mapper/StGateBMapper.xml @@ -38,4 +38,22 @@ #{item.status,jdbcType=INTEGER}, #{item.tm,jdbcType=TIMESTAMP}) + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/StGateRecordMapper.xml b/src/main/resources/mapper/StGateRecordMapper.xml new file mode 100644 index 0000000..a252150 --- /dev/null +++ b/src/main/resources/mapper/StGateRecordMapper.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file