From fa0d79ec13774593d14fd537e71908d084969233 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 27 七月 2024 10:22:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayCtrl.java | 9 +--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayCtrl.java | 9 +--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 135 ++++++++++++++++++++++++++++++---------------
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayCtrl.java | 9 +--
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java | 9 +--
7 files changed, 104 insertions(+), 71 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index c0b3971..f3dfb90 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -206,7 +206,7 @@
and rldl.dt <= #{endDt,jdbcType=DATE}
</if>
</where>
- ORDER BY rldl.id DESC
+ ORDER BY rld.dt DESC , rld.loss_amount DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
index ddea63e..bdf5d9a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml
@@ -196,7 +196,7 @@
and rld.dt <= #{endDt,jdbcType=DATE}
</if>
</where>
- ORDER BY rld.id DESC
+ ORDER BY rld.dt DESC , rld.loss_amount DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
</if>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
index f6008a4..d3ca03d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrMwTestWeb.common.CodeLocal;
import lombok.extern.slf4j.Slf4j;
@@ -29,50 +30,58 @@
if(com == null){
rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
}else{
- if(com.equals("10")){
- rt = this.cd10() ;
- }else if(com.equals("21")){
- rt = this.cd21() ;
- }else if(com.equals("37")){
- rt = this.cd37() ;
- }else if(com.equals("67")){
- rt = this.cd67() ;
- }else if(com.equals("38")){
- rt = this.cd38() ;
- }else if(com.equals("68")){
- rt = this.cd68() ;
- }else if(com.equals("39")){
- rt = this.cd39() ;
- }else if(com.equals("69")){
- rt = this.cd69() ;
- }else if(com.equals("3A")){
- rt = this.cd3A() ;
- }else if(com.equals("6A")){
- rt = this.cd6A() ;
- }else if(com.equals("3B")){
- rt = this.cd3B() ;
- }else if(com.equals("6B")){
- rt = this.cd6B() ;
- }else if(com.equals("3C")){
- rt = this.cd3C() ;
- }else if(com.equals("65")){
- rt = this.cd65() ;
- }else if(com.equals("91")){
- rt = this.cd91() ;
- }else if(com.equals("92")){
- rt = this.cd92() ;
- }else if(com.equals("93")){
- rt = this.cd93() ;
- }else if(com.equals("97")){
- rt = this.cd97() ;
- }else if(com.equals("98")){
- rt = this.cd98() ;
- }else if(com.equals("99")){
- rt = this.cd99() ;
- }else if(com.equals("A0")){
- rt = this.cdA0() ;
- }else if(com.equals("B0")){
- rt = this.cdB0() ;
+ try{
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("21")){
+ rt = this.cd21() ;
+ }else if(com.equals("37")){
+ rt = this.cd37() ;
+ }else if(com.equals("67")){
+ rt = this.cd67() ;
+ }else if(com.equals("38")){
+ rt = this.cd38() ;
+ }else if(com.equals("68")){
+ rt = this.cd68() ;
+ }else if(com.equals("39")){
+ rt = this.cd39() ;
+ }else if(com.equals("69")){
+ rt = this.cd69() ;
+ }else if(com.equals("3A")){
+ rt = this.cd3A() ;
+ }else if(com.equals("6A")){
+ rt = this.cd6A() ;
+ }else if(com.equals("3B")){
+ rt = this.cd3B() ;
+ }else if(com.equals("6B")){
+ rt = this.cd6B() ;
+ }else if(com.equals("3C")){
+ rt = this.cd3C() ;
+ }else if(com.equals("65")){
+ rt = this.cd65() ;
+ }else if(com.equals("91")){
+ rt = this.cd91() ;
+ }else if(com.equals("92")){
+ rt = this.cd92() ;
+ }else if(com.equals("93")){
+ rt = this.cd93() ;
+ }else if(com.equals("97")){
+ rt = this.cd97() ;
+ }else if(com.equals("98")){
+ rt = this.cd98() ;
+ }else if(com.equals("99")){
+ rt = this.cd99() ;
+ }else if(com.equals("A0")){
+ rt = this.cdA0() ;
+ }else if(com.equals("A1")){
+ rt = this.cdA1() ;
+ }else if(com.equals("A2")){
+ rt = this.cdA2() ;
+ }else if(com.equals("B0")){
+ rt = this.cdB0() ;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
}
return rt ;
@@ -204,9 +213,45 @@
comVo.moneyRemain = 234.56 ;
comVo.waterPrice = 1.2 ;
comVo.waterAmount = 10 ;
- return this.sendCom2Mw(this.command(CodeV1_0_1.cd_98, comVo, null)) ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A0, comVo, null)) ;
}
+
+ //瀹氭椂鍏抽榾璁″垝寮�闃�
+ private BaseResponse cdA1() throws Exception {
+ ComA1Vo comVo = new ComA1Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.minutes = 3 ;
+ String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 5) ;//灏嗘潵5鍒嗛挓
+ int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ;
+ comVo.year = nextDt[0] ;
+ comVo.month = nextDt[1] ;
+ comVo.day = nextDt[2] ;
+ comVo.hour = nextDt[3] ;
+ comVo.minute = nextDt[4] ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A1, comVo, null)) ;
+ }
+
+ //瀹氶噺鍏抽榾璁″垝寮�闃�
+ private BaseResponse cdA2() throws Exception {
+ ComA2Vo comVo = new ComA2Vo() ;
+ comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo;
+ comVo.moneyRemain = 234.56 ;
+ comVo.waterPrice = 1.2 ;
+ comVo.waterAmount = 10 ;
+ String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 5) ;//灏嗘潵5鍒嗛挓
+ int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ;
+ comVo.year = nextDt[0] ;
+ comVo.month = nextDt[1] ;
+ comVo.day = nextDt[2] ;
+ comVo.hour = nextDt[3] ;
+ comVo.minute = nextDt[4] ;
+ return this.sendCom2Mw(this.command(CodeV1_0_1.cd_A2, comVo, null)) ;
+ }
+
+
private BaseResponse cdB0(){
return this.sendCom2Mw(this.command(CodeV1_0_1.cd_B0, null, null)) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayCtrl.java
index 78f3af1..94aaa14 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayCtrl.java
@@ -16,10 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -56,7 +53,7 @@
})
@GetMapping(path = "/getClientAmountDayHistory")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoClientAmountDay>>> getClientAmountDayHistory(@RequestBody ClientAmountDayQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoClientAmountDay>>> getClientAmountDayHistory(@RequestParam ClientAmountDayQueryVo vo) {
try {
QueryResultVo<List<VoClientAmountDay>> res = clientAmountDaySv.getClientAmountDayHistory(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -84,7 +81,7 @@
})
@GetMapping(path = "/getClientAmountDayLast")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoClientAmountDay>>> getClientAmountDayLast(@RequestBody ClientAmountDayQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoClientAmountDay>>> getClientAmountDayLast(@RequestParam ClientAmountDayQueryVo vo) {
try {
QueryResultVo<List<VoClientAmountDay>> res = clientAmountDaySv.getClientAmountDayLast(vo);
return BaseResponseUtils.buildSuccess(res);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java
index 15bd426..26caa3a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java
@@ -16,10 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -56,7 +53,7 @@
})
@GetMapping(path = "/getControllerAlarmStateHistory")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoControllerAlarmState>>> getControllerAlarmStateHistory(@RequestBody ControllerAlarmStateQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoControllerAlarmState>>> getControllerAlarmStateHistory(@RequestParam ControllerAlarmStateQueryVo vo) {
try {
QueryResultVo<List<VoControllerAlarmState>> res = controllerAlarmStateSv.getControllerAlarmStateHistory(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -85,7 +82,7 @@
})
@GetMapping(path = "/getControllerAlarmStateLast")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoControllerAlarmState>>> getControllerAlarmStateLast(@RequestBody ControllerAlarmStateQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoControllerAlarmState>>> getControllerAlarmStateLast(@RequestParam ControllerAlarmStateQueryVo vo) {
try {
QueryResultVo<List<VoControllerAlarmState>> res = controllerAlarmStateSv.getControllerAlarmStateLast(vo);
return BaseResponseUtils.buildSuccess(res);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayCtrl.java
index 1308c38..80bc40d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayCtrl.java
@@ -16,10 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -55,7 +52,7 @@
})
@GetMapping(path = "/getIntakeAmountDayHistory")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoIntakeAmountDay>>> getIntakeAmountDayHistory(@RequestBody IntakeAmountDayQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoIntakeAmountDay>>> getIntakeAmountDayHistory(@RequestParam IntakeAmountDayQueryVo vo) {
try {
QueryResultVo<List<VoIntakeAmountDay>> res = intakeAmountDaySv.getIntakeAmountDayHistory(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -82,7 +79,7 @@
})
@GetMapping(path = "/getIntakeAmountDayLast")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoIntakeAmountDay>>> getIntakeAmountDayLast(@RequestBody IntakeAmountDayQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoIntakeAmountDay>>> getIntakeAmountDayLast(@RequestParam IntakeAmountDayQueryVo vo) {
try {
QueryResultVo<List<VoIntakeAmountDay>> res = intakeAmountDaySv.getIntakeAmountDayLast(vo);
return BaseResponseUtils.buildSuccess(res);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayCtrl.java
index 49ca0aa..c2edd27 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayCtrl.java
@@ -19,10 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -59,7 +56,7 @@
})
@GetMapping(path = "/getLossDayHistory")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoLossDay>>> getLossDayHistory(@RequestBody LossDayQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoLossDay>>> getLossDayHistory(@RequestParam LossDayQueryVo vo) {
try {
QueryResultVo<List<VoLossDay>> res = lossDaySv.getLossDayHistory(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -86,7 +83,7 @@
})
@GetMapping(path = "/getLossDayLast")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoLossDay>>> getLossDayLast(@RequestBody LossDayQueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoLossDay>>> getLossDayLast(@RequestParam LossDayQueryVo vo) {
try {
QueryResultVo<List<VoLossDay>> res = lossDaySv.getLossDayLast(vo);
return BaseResponseUtils.buildSuccess(res);
--
Gitblit v1.8.0