pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -170,7 +170,7 @@ * 2:刷卡关阀； * 3:中心站开阀； * 4:中心站关阀； * 5:欠费关阀； * 5:余额不足关阀； * 6:流量计故障关阀； * 7:紧急关闭； * 8:用户远程开阀； @@ -190,7 +190,7 @@ case 2 -> "刷卡关阀"; case 3 -> "中心站开阀"; case 4 -> "中心站关阀"; case 5 -> "欠费关阀"; case 5 -> "余额不足关阀"; case 6 -> "流量计故障关阀"; case 7 -> "紧急关阀"; case 8 -> "用户远程开阀"; pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
@@ -84,14 +84,14 @@ if(cvo.icCardNo == null){ throw new Exception("虚拟IC卡编号不能为空") ; } if(cvo.moneyRemain == null){ throw new Exception("剩余金额不能为空") ; if(cvo.moneyRemain == null || cvo.moneyRemain == 0.0){ throw new Exception("剩余金额不能为空或为0") ; } if(cvo.waterPrice == null){ throw new Exception("水价不能为空") ; if(cvo.waterPrice == null || cvo.waterPrice == 0.0){ throw new Exception("水价不能为空或为0") ; } if(cvo.minutes == null){ throw new Exception("用水时长不能为空") ; if(cvo.minutes == null || cvo.minutes == 0.0){ throw new Exception("用水时长不能为空或为0") ; } if(cvo.minutes < 0 || cvo.minutes > 9999){ throw new Exception("用水时长取值范围是0~9999分钟") ; pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
@@ -84,14 +84,14 @@ if(cvo.icCardNo == null){ throw new Exception("虚拟IC卡编号不能为空") ; } if(cvo.moneyRemain == null){ throw new Exception("剩余金额不能为空") ; if(cvo.moneyRemain == null || cvo.moneyRemain == 0.0){ throw new Exception("剩余金额不能为空或为0") ; } if(cvo.waterPrice == null){ throw new Exception("水价不能为空") ; if(cvo.waterPrice == null || cvo.waterPrice == 0.0){ throw new Exception("水价不能为空或为0") ; } if(cvo.waterAmount == null){ throw new Exception("预用水量不能为空") ; if(cvo.waterAmount == null || cvo.waterAmount == 0.0){ throw new Exception("预用水量不能为空或为0") ; } if(cvo.waterAmount < 0 || cvo.waterAmount > 9999){ throw new Exception("预用水量取值范围是0~9999m3") ; @@ -102,7 +102,7 @@ // midRs.param = icCardNoGrp[0] ; //} //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ; byte[] bs = new byte[16] ; byte[] bs = new byte[8] ; index = 0 ; GlCreate.createIcCardNo(cvo.icCardNo, bs, 0); bytes = ByteUtil.bytesMerge(bsHead, bs) ; pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A1_Down.java
@@ -85,14 +85,14 @@ if(cvo.icCardNo == null){ throw new Exception("虚拟IC卡编号不能为空") ; } if(cvo.moneyRemain == null){ throw new Exception("剩余金额不能为空") ; if(cvo.moneyRemain == null || cvo.moneyRemain == 0.0){ throw new Exception("剩余金额不能为空或为0") ; } if(cvo.waterPrice == null){ throw new Exception("水价不能为空") ; if(cvo.waterPrice == null || cvo.waterPrice == 0.0){ throw new Exception("水价不能为空或为0") ; } if(cvo.minutes == null){ throw new Exception("用水时长不能为空") ; if(cvo.minutes == null || cvo.minutes == 0.0){ throw new Exception("用水时长不能为空或为0") ; } if(cvo.minutes < 0 || cvo.minutes > 9999){ throw new Exception("用水时长取值范围是0~9999分钟") ; pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java
@@ -85,14 +85,14 @@ if(cvo.icCardNo == null){ throw new Exception("虚拟IC卡编号不能为空") ; } if(cvo.moneyRemain == null){ throw new Exception("剩余金额不能为空") ; if(cvo.moneyRemain == null || cvo.moneyRemain == 0.0){ throw new Exception("剩余金额不能为空或为0") ; } if(cvo.waterPrice == null){ throw new Exception("水价不能为空") ; if(cvo.waterPrice == null || cvo.waterPrice == 0.0){ throw new Exception("水价不能为空或为0") ; } if(cvo.waterAmount == null){ throw new Exception("预用水量不能为空") ; if(cvo.waterAmount == null || cvo.waterAmount == 0.0){ throw new Exception("预用水量不能为空或为0") ; } if(cvo.waterAmount < 0 || cvo.waterAmount > 9999){ throw new Exception("预用水量取值范围是0~9999m3") ; @@ -136,7 +136,7 @@ // midRs.param = icCardNoGrp[0] ; //} //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ; byte[] bs = new byte[16] ; byte[] bs = new byte[8] ; index = 0 ; GlCreate.createIcCardNo(cvo.icCardNo, bs, 0); bytes = ByteUtil.bytesMerge(bsHead, bs) ; pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -494,7 +494,7 @@ CASE WHEN oh.op_type = 1 THEN '刷卡开阀' WHEN oh.op_type = 3 THEN '中心站开阀' WHEN oh.op_type = 5 THEN '欠费关阀' WHEN oh.op_type = 5 THEN '余额不足关阀' WHEN oh.op_type = 8 THEN '用户远程开阀' WHEN oh.op_type = 11 THEN '开关阀卡开阀' ELSE '未知' @@ -510,7 +510,7 @@ CASE WHEN oh.cl_type = 2 THEN '刷卡关阀' WHEN oh.cl_type = 4 THEN '中心站关阀' WHEN oh.cl_type = 5 THEN '欠费关阀' WHEN oh.cl_type = 5 THEN '余额不足关阀' WHEN oh.cl_type = 6 THEN '流量计故障关阀' WHEN oh.cl_type = 7 THEN '紧急关阀' WHEN oh.cl_type = 9 THEN '用户远程关阀' @@ -563,7 +563,7 @@ CASE WHEN oh.op_type = 1 THEN '刷卡开阀' WHEN oh.op_type = 3 THEN '中心站开阀' WHEN oh.op_type = 5 THEN '欠费关阀' WHEN oh.op_type = 5 THEN '余额不足关阀' WHEN oh.op_type = 8 THEN '用户远程开阀' WHEN oh.op_type = 11 THEN '开关阀卡开阀' ELSE '未知' @@ -579,7 +579,7 @@ CASE WHEN oh.cl_type = 2 THEN '刷卡关阀' WHEN oh.cl_type = 4 THEN '中心站关阀' WHEN oh.cl_type = 5 THEN '欠费关阀' WHEN oh.cl_type = 5 THEN '余额不足关阀' WHEN oh.cl_type = 6 THEN '流量计故障关阀' WHEN oh.cl_type = 7 THEN '紧急关闭' WHEN oh.cl_type = 9 THEN '用户远程关阀' pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -490,7 +490,7 @@ CASE WHEN oh.op_type = 1 THEN '刷卡开阀' WHEN oh.op_type = 3 THEN '中心站开阀' WHEN oh.op_type = 5 THEN '欠费关阀' WHEN oh.op_type = 5 THEN '余额不足关阀' WHEN oh.op_type = 8 THEN '用户远程开阀' WHEN oh.op_type = 11 THEN '开关阀卡开阀' ELSE '未知' @@ -506,7 +506,7 @@ CASE WHEN oh.cl_type = 2 THEN '刷卡关阀' WHEN oh.cl_type = 4 THEN '中心站关阀' WHEN oh.cl_type = 5 THEN '欠费关阀' WHEN oh.cl_type = 5 THEN '余额不足关阀' WHEN oh.cl_type = 6 THEN '流量计故障关阀' WHEN oh.cl_type = 7 THEN '紧急关闭' WHEN oh.cl_type = 9 THEN '用户远程关阀' @@ -560,7 +560,7 @@ CASE WHEN oh.op_type = 1 THEN '刷卡开阀' WHEN oh.op_type = 3 THEN '中心站开阀' WHEN oh.op_type = 5 THEN '欠费关阀' WHEN oh.op_type = 5 THEN '余额不足关阀' WHEN oh.op_type = 8 THEN '用户远程开阀' WHEN oh.op_type = 11 THEN '开关阀卡开阀' ELSE '未知' @@ -576,7 +576,7 @@ CASE WHEN oh.cl_type = 2 THEN '刷卡关阀' WHEN oh.cl_type = 4 THEN '中心站关阀' WHEN oh.cl_type = 5 THEN '欠费关阀' WHEN oh.cl_type = 5 THEN '余额不足关阀' WHEN oh.cl_type = 6 THEN '流量计故障关阀' WHEN oh.cl_type = 7 THEN '紧急关阀' WHEN oh.cl_type = 9 THEN '用户远程关阀' pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -228,7 +228,7 @@ private BaseResponse cdA0(){ ComA0Vo comVo = new ComA0Vo() ; comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo; comVo.moneyRemain = 234.56 ; comVo.moneyRemain = 1.23 ; comVo.waterPrice = 1.2 ; comVo.waterAmount = 10 ; return this.sendCom2Mw(this.commandOuter(CodeV1_0_1.cd_A0, comVo, null)) ; @@ -239,10 +239,10 @@ private BaseResponse cdA1() throws Exception { ComA1Vo comVo = new ComA1Vo() ; comVo.icCardNo = CommandP206V1_0_0Ctrl.vsIcCardNo; comVo.moneyRemain = 234.56 ; comVo.moneyRemain = 1.23 ; comVo.waterPrice = 1.2 ; comVo.minutes = 3 ; String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), comVo.minutes) ;//将来X分钟 comVo.minutes = 30 ; String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 3) ;//将来X分钟 int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ; comVo.year = nextDt[0] ; comVo.month = nextDt[1] ; @@ -259,7 +259,7 @@ 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分钟 String nextDtStr = DateTime.nextXMinute_yyyy_MM_dd_HH_mm_ss(DateTime.yyyy_MM_dd_HH_mm_ss(), 3) ;//将来X分钟 int[] nextDt = DateTime.yyyy_MM_dd_HH_MM_SS_2_ymdhmsGroup(nextDtStr) ; comVo.year = nextDt[0] ; comVo.month = nextDt[1] ; pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
@@ -45,7 +45,6 @@ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(clientSv.getLargeOpenCountClients(qo)); } catch (Exception e) { @@ -66,7 +65,6 @@ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(clientSv.getSmallOpenCountClients(qo)); } catch (Exception e) {
