diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java b/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java index 903c558..781aee7 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java @@ -74,8 +74,8 @@ public class GateValveCctvRelController { @Operation(summary = "列表") @PostMapping("/list") - public R> list() { - return R.ok(service.lambdaQuery().list()); + public R> list() { + return R.ok(service.queryList()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java b/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java index 5d4011f..814f36b 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/GateValveRealController.java @@ -7,6 +7,7 @@ import com.gunshi.project.xyt.service.GateValveRealService; 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.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** * 描述: 闸阀开关表 @@ -55,6 +57,12 @@ public class GateValveRealController { return R.ok(service.gateStatusList()); } + @Operation(summary = "通过闸阀查询实时流量") + @GetMapping("/realQ") + public R realQ(@RequestParam("valveCode") @Parameter(description = "闸阀编码") String valveCode) { + return R.ok(service.realQ(valveCode)); + } + @Operation(summary = "分页") @PostMapping("/page") public R> page() { diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateValveCctvRelVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateValveCctvRelVo.java index 6a64c04..60b34af 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateValveCctvRelVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateValveCctvRelVo.java @@ -34,4 +34,7 @@ public class GateValveCctvRelVo extends GateValveCctvRel { @Schema(description="摄像头名称") private String name; + @Schema(description="类型(1球机 2枪机)") + private Integer type; + } diff --git a/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java index f0c1899..c5bda01 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java @@ -9,6 +9,8 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * 描述: 闸阀关联视频点 * author: xusan @@ -37,4 +39,14 @@ public interface GateValveCctvRelMapper extends BaseMapper { """) Page pages(@Param("page") Page page,@Param("obj") GateValveCctvRelPage obj); + + @Select(""" + + """) + List queryList(); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java index 45d3ce9..50c69ff 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gunshi.project.xyt.entity.vo.GateStautsVo; import com.gunshi.project.xyt.model.GateValveReal; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.math.BigDecimal; import java.util.List; /** @@ -25,4 +27,12 @@ public interface GateValveRealMapper extends BaseMapper { """) List gateStatusList(); + + @Select(""" + + """) + BigDecimal realQ(@Param("valveCode") String valveCode); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/GateValveCctvRelService.java b/src/main/java/com/gunshi/project/xyt/service/GateValveCctvRelService.java index dcf05f8..69b65fe 100644 --- a/src/main/java/com/gunshi/project/xyt/service/GateValveCctvRelService.java +++ b/src/main/java/com/gunshi/project/xyt/service/GateValveCctvRelService.java @@ -10,6 +10,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * 描述: 闸阀关联视频点 * author: xusan @@ -24,6 +26,10 @@ public class GateValveCctvRelService extends ServiceImpl pages(GateValveCctvRelPage page){ return getBaseMapper().pages(page.getPageSo().toPage(), page); } + + public List queryList() { + return baseMapper.queryList(); + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java b/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java index c758e43..6ba02f0 100644 --- a/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java +++ b/src/main/java/com/gunshi/project/xyt/service/GateValveRealService.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -32,6 +33,10 @@ public class GateValveRealService extends ServiceImpl