From 2e930e8e96bca4159538ba84fae1c62880134e5c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 15:47:58 +0800
Subject: [PATCH] 2024-07-02 朱宝民 获取充值记录
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 24 +++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 20 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 104 ++++++++++++++++-
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java | 25 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 24 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 40 +++---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java | 63 +++++-----
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java | 22 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java | 1
9 files changed, 229 insertions(+), 94 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index c4931dc..6275ab9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -256,6 +256,7 @@
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
+ comId = rmCommandHistory.getId();
// 鍥炶皟寮傚父
if(!response_CallBack.getCode().equals("0001")) {
@@ -289,12 +290,24 @@
System.out.println(job_subData);
Boolean dealResult = job_subData.getBoolean("success");
if(!dealResult) {
+ /**
+ * 鎵ц澶辫触
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ */
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)0);
+ rmCommandHistory.setResultTime(new Date());
+ rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
}
/**
- * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹�
+ * 鎵ц鎴愬姛
* 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ * 杩斿洖鍥炶皟鍐呭
*/
if(comType != null) {
SeVirtualCard virtualCard = new SeVirtualCard();
@@ -311,6 +324,15 @@
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
+
+ // 鏇存柊鍛戒护鏃ュ織锛氭墽琛岀粨鏋溿�佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)1);
+ rmCommandHistory.setResultTime(new Date());
+ rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+
return BaseResponseUtils.buildSuccess(myData) ;
} else {
// 璇锋眰澶辫触
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java
index 7161e1c..85933e7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java
@@ -43,6 +43,5 @@
* @param intakeId
* @return
*/
- //VoUnclosedParam getUncloseParam(Long intakeId);
VoUnclosedParam getUncloseParam(@Param("onLineMap") String onLineMap, @Param("intakeId")Long intakeId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index d9fa1de..2930b70 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -253,13 +253,13 @@
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
- <if test = "paymentId != null and paymentId > 0">
- AND ope.payment_id = ${paymentId}
- </if>
+<!-- <if test = "paymentId != null and paymentId > 0">-->
+<!-- AND ope.payment_id = ${paymentId}-->
+<!-- </if>-->
- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">
- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
- </if>
+<!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
+<!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
+<!-- </if>-->
</where>
</select>
@@ -297,13 +297,13 @@
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
- <if test = "paymentId != null and paymentId > 0">
- AND ope.payment_id = ${paymentId}
- </if>
+<!-- <if test = "paymentId != null and paymentId > 0">-->
+<!-- AND ope.payment_id = ${paymentId}-->
+<!-- </if>-->
- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">
- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
- </if>
+<!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
+<!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
+<!-- </if>-->
</where>
ORDER BY ope.operate_dt DESC
<trim prefix="limit " >
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
index 76b86b6..40dde5d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealCloseValveReport.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
@@ -141,21 +140,22 @@
* @throws Exception
*/
private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
- RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- null, null, null, null, null, null,null,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- dataCd83CloseVo.type,
- dataCd83CloseVo.totalAmount,
- dataCd83CloseVo.icCardNo,
- dataCd83CloseVo.icCardAddr,
- dataCd83CloseVo.remainMoney,
- dataCd83CloseVo.thisAmount,
- dataCd83CloseVo.thisMoney,
- dataCd83CloseVo.thisTime,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
- return po ;
+ //RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+ // rtuAddr,
+ // null, null, null, null, null, null,null,
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+ // dataCd83CloseVo.type,
+ // dataCd83CloseVo.totalAmount,
+ // dataCd83CloseVo.icCardNo,
+ // dataCd83CloseVo.icCardAddr,
+ // dataCd83CloseVo.remainMoney,
+ // dataCd83CloseVo.thisAmount,
+ // dataCd83CloseVo.thisMoney,
+ // dataCd83CloseVo.thisTime,
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
+ //return po ;
+ return null;
}
@@ -169,21 +169,22 @@
* @throws Exception
*/
private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
- RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- null, null, null, null, null, null,null,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- dataCd83CloseVo.type,
- dataCd83CloseVo.totalAmount,
- dataCd83CloseVo.icCardNo,
- dataCd83CloseVo.icCardAddr,
- dataCd83CloseVo.remainMoney,
- dataCd83CloseVo.thisAmount,
- dataCd83CloseVo.thisMoney,
- dataCd83CloseVo.thisTime,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
- return po ;
+ //RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+ // rtuAddr,
+ // null, null, null, null, null, null,null,
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+ // dataCd83CloseVo.type,
+ // dataCd83CloseVo.totalAmount,
+ // dataCd83CloseVo.icCardNo,
+ // dataCd83CloseVo.icCardAddr,
+ // dataCd83CloseVo.remainMoney,
+ // dataCd83CloseVo.thisAmount,
+ // dataCd83CloseVo.thisMoney,
+ // dataCd83CloseVo.thisTime,
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
+ //return po ;
+ return null;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java
new file mode 100644
index 0000000..b94ede4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Usability.java
@@ -0,0 +1,22 @@
+package com.dy.pipIrrRemote.common.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-07-02 11:00
+ * @LastEditTime 2024-07-02 11:00
+ * @Description 缁堢鐢ㄦ按鏈夋晥鎬у璞�
+ */
+
+@Data
+public class Usability extends DtoBase {
+ public static final long serialVersionUID = 202407021101001L;
+
+ /**
+ * 缁堢鐢ㄦ按鏈夋晥鎬�
+ */
+ @NotNull(message = "缁堢鐢ㄦ按鏈夋晥鎬т笉鑳戒负绌�")
+ private Boolean valid;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index 955340f..84668b9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -6,10 +6,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd15Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd9CVo;
+import com.dy.common.mw.protocol.p206V202404.downVos.*;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -21,10 +18,7 @@
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import com.dy.pipIrrRemote.common.CommandSv;
-import com.dy.pipIrrRemote.common.dto.Card;
-import com.dy.pipIrrRemote.common.dto.DtoBase;
-import com.dy.pipIrrRemote.common.dto.Recharge;
-import com.dy.pipIrrRemote.common.dto.ValveOpen;
+import com.dy.pipIrrRemote.common.dto.*;
import com.dy.pipIrrRemote.result.RemoteResultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -461,4 +455,98 @@
return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
}
+
+ /**
+ * 璁惧缁堢鐢ㄦ按鎺у埗
+ * @param usability
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "usability", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> usability(@RequestBody @Valid Usability usability, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = usability.getIntakeId();
+ Boolean valid = usability.getValid();
+ Long operator = usability.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ if(valid) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_30;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd31Vo param = new ComCd31Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.valid = true;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ }else {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_31;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd31Vo param = new ComCd31Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.valid = false;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ }
+ } else if(protocol.equals("p206V1_0_1")) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
+ } else {
+ return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 180bfe9..2dbd8b0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -220,16 +220,16 @@
*/
public QueryResultVo<List<VoRecharge>> getRecharges(QoRecharge queryVo) {
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
- String rechargeTimeStart = queryVo.rechargeTimeStart;
- String rechargeTimeStop = queryVo.rechargeTimeStop;
- if(rechargeTimeStart != null) {
- rechargeTimeStart = rechargeTimeStart + " 00:00:00";
- queryVo.setRechargeTimeStart(rechargeTimeStart);
- }
- if(rechargeTimeStop != null) {
- rechargeTimeStop = rechargeTimeStop + " 23:59:59";
- queryVo.setRechargeTimeStop(rechargeTimeStop);
- }
+ //String rechargeTimeStart = queryVo.rechargeTimeStart;
+ //String rechargeTimeStop = queryVo.rechargeTimeStop;
+ //if(rechargeTimeStart != null) {
+ // rechargeTimeStart = rechargeTimeStart + " 00:00:00";
+ // queryVo.setRechargeTimeStart(rechargeTimeStart);
+ //}
+ //if(rechargeTimeStop != null) {
+ // rechargeTimeStop = rechargeTimeStop + " 23:59:59";
+ // queryVo.setRechargeTimeStop(rechargeTimeStop);
+ //}
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
index 543e308..bafa458 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
@@ -20,17 +20,20 @@
@Schema(name = "IC鍗″厖鍊艰褰曟煡璇㈡潯浠�")
public class QoRecharge extends QueryConditionVo {
- @Schema(description = "鍐滄埛濮撳悕")
- public String clientName;
+ private String clientName;
- @Schema(description = "鍐滄埛缂栧彿")
- private Long clientId;
+ private String clientNum;
- @Schema(description = "IC鍗″彿")
- public String cardAddr;
+ private Long cardNum;
- @Schema(description = "浠樻鏂瑰紡")
- public Integer paymentId;
+ //@Schema(description = "鍐滄埛缂栧彿")
+ //private Long clientId;
+
+ //@Schema(description = "IC鍗″彿")
+ //public String cardAddr;
+
+ //@Schema(description = "浠樻鏂瑰紡")
+ //public Integer paymentId;
//@Schema(description = "鍏呭�兼椂闂確寮�濮�")
//public LocalDateTime rechargeTimeStart;
@@ -38,9 +41,7 @@
//@Schema(description = "鍏呭�兼椂闂確缁撴潫")
//public LocalDateTime rechargeTimeStop;
- @Schema(description = "鍏呭�兼椂闂確寮�濮�")
- public String rechargeTimeStart;
+ //public String rechargeTimeStart;
- @Schema(description = "鍏呭�兼椂闂確缁撴潫")
- public String rechargeTimeStop;
+ //public String rechargeTimeStop;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index 6d032a7..d707242 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -62,25 +62,6 @@
}
/**
- * 娣诲姞鍛戒护鏃ュ織
- * @param po 鍛戒护鏃ュ織瀵硅薄
- * @return 瀛楃涓茬被鍨嬬殑涓婚敭
- */
- public Long insert(RmCommandHistory po) {
- rmCommandHistoryMapper.insert(po);
- return po.getId();
- }
-
- /**
- * 淇敼鍛戒护鏃ュ織淇℃伅
- * @param po 鍛戒护鏃ュ織瀵硅薄
- * @return 褰卞搷璁板綍鏁伴噺
- */
- public Integer update(RmCommandHistory po) {
- return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
- }
-
- /**
* 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級
* @param operator
* @return
@@ -135,4 +116,25 @@
public SeClientCard geClientCardByCardId(Long cardId) {
return seClientCardMapper.selectByPrimaryKey(cardId);
}
+
+ /**
+ * 娣诲姞鍛戒护鏃ュ織
+ * @param po 鍛戒护鏃ュ織瀵硅薄
+ * @return 瀛楃涓茬被鍨嬬殑涓婚敭
+ */
+ public Long insert(RmCommandHistory po) {
+ rmCommandHistoryMapper.insert(po);
+ return po.getId();
+ }
+
+ /**
+ * 淇敼鍛戒护鏃ュ織淇℃伅
+ * @param po 鍛戒护鏃ュ織瀵硅薄
+ * @return 褰卞搷璁板綍鏁伴噺
+ */
+ public Integer update(RmCommandHistory po) {
+ return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
+ }
+
+
}
--
Gitblit v1.8.0