From 03df72155ccd47912384b3e5f3fceb7331e377de Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 13 九月 2024 14:48:49 +0800
Subject: [PATCH] 2024-09-13 朱宝民 优化获取交易明细记录，余额改为操作表余额，返回字段增加收银员姓名及分页参数
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterCtrl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterCtrl.java
index 96513c4..3cbbdeb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterCtrl.java
@@ -59,9 +59,9 @@
PrFlowmeter prFlowmeter = DtoToFlowmeterPojo.INSTANCT.po2vo(po);
Date operateTime = new Date();
- prFlowmeter.setOperatedt(operateTime);
+ prFlowmeter.setOperateDt(operateTime);
prFlowmeter.setDeleted((byte) 0);
- prFlowmeter.setReporttime(operateTime);
+ prFlowmeter.setReportTime(operateTime);
Integer rec = Optional.ofNullable(flowmeterSv.addFlowmeter(prFlowmeter)).orElse(0);
if (rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.ADD_FLOWMETER_FAIL.getMessage());
@@ -108,18 +108,41 @@
schema = @Schema(implementation = PrFlowmeter.class))}
)
})
- @GetMapping(path = "getFlowMeters", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "getFlowMeters")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoFlowMeter>>> getFlowMeters(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVoFlowMeter vo) {
+ public BaseResponse<QueryResultVo<List<VoFlowMeter>>> getFlowMeters(QueryVoFlowMeter vo) {
try {
QueryResultVo<List<VoFlowMeter>> res = flowmeterSv.getFlowMeters(vo);
- if (res == null) {
- return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOWMETERS.getMessage());
+ if (res.itemTotal != null && res.itemTotal > 0) {
+ return BaseResponseUtils.buildSuccess(res);
}
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOWMETERS.getMessage());
} catch (Exception e) {
log.error("鑾峰彇娴侀噺璁¤褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
+ @Operation(summary = "鑾峰緱鍏ㄩ儴娴侀噺璁�", description = "杩斿洖鍏ㄩ儴娴侀噺璁�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖鍏ㄩ儴娴侀噺璁★紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = PrFlowmeter.class))}
+ )
+ })
+ @GetMapping(path = "all")
+ @SsoAop()
+ public BaseResponse<List<PrFlowmeter>> getFlowMeterAll() {
+ try {
+ List<PrFlowmeter> res = flowmeterSv.getFlowMeterAll();
+ if (res != null && res.size() > 0) {
+ return BaseResponseUtils.buildSuccess(res);
+ }
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_DATA.getMessage());
+ } catch (Exception e) {
+ log.error("鑾峰彇娴侀噺璁℃暟鎹紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0