From 0c5606be951e50c6e86671ecde51b012f5d55735 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 14:32:26 +0800
Subject: [PATCH] 2024-06-18 朱宝民 开关阀报（未完）
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 343 +++++++-----
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml | 1
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 368 ++++++++------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 239 +++++---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java | 102 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java | 46 -
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java | 55 -
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java | 393 +++++++++++---
8 files changed, 982 insertions(+), 565 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
index ab59ab4..412db49 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java
@@ -1,61 +1,27 @@
package com.dy.pipIrrGlobal.daoRm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
import org.apache.ibatis.annotations.Mapper;
/**
- * @Author liurunyu
- * @Date 2024/2/23 15:42
- * @LastEditTime 2024/2/23 15:42
+ * @author ZhuBaoMin
+ * @date 2024-06-17 11:27
+ * @LastEditTime 2024-06-17 11:27
* @Description
*/
+
@Mapper
-public interface RmOpenCloseValveHistoryMapper {
- /**
- * delete by primary key
- *
- * @param id primaryKey
- * @return deleteCount
- */
+public interface RmOpenCloseValveHistoryMapper extends BaseMapper<RmOpenCloseValveHistory> {
int deleteByPrimaryKey(Long id);
- /**
- * insert record to table
- *
- * @param record the record
- * @return insert count
- */
int insert(RmOpenCloseValveHistory record);
- /**
- * insert record to table selective
- *
- * @param record the record
- * @return insert count
- */
int insertSelective(RmOpenCloseValveHistory record);
- /**
- * select by primary key
- *
- * @param id primary key
- * @return object by primary key
- */
RmOpenCloseValveHistory selectByPrimaryKey(Long id);
- /**
- * update record selective
- *
- * @param record the updated record
- * @return update count
- */
int updateByPrimaryKeySelective(RmOpenCloseValveHistory record);
- /**
- * update record
- *
- * @param record the updated record
- * @return update count
- */
int updateByPrimaryKey(RmOpenCloseValveHistory record);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
index 8dbadd4..b750ae4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java
@@ -1,64 +1,35 @@
package com.dy.pipIrrGlobal.daoRm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import org.apache.ibatis.annotations.Mapper;
-import java.util.List;
-
/**
- * @Author liurunyu
- * @Date 2024/2/23 16:00
- * @LastEditTime 2024/2/23 16:00
+ * @author ZhuBaoMin
+ * @date 2024-06-17 11:28
+ * @LastEditTime 2024-06-17 11:28
* @Description
- */
+ */
+
@Mapper
-public interface RmOpenCloseValveLastMapper {
- /**
- * delete by primary key
- * @param id primaryKey
- * @return deleteCount
- */
+public interface RmOpenCloseValveLastMapper extends BaseMapper<RmOpenCloseValveLast> {
int deleteByPrimaryKey(Long id);
- /**
- * insert record to table
- * @param record the record
- * @return insert count
- */
int insert(RmOpenCloseValveLast record);
- /**
- * insert record to table selective
- * @param record the record
- * @return insert count
- */
int insertSelective(RmOpenCloseValveLast record);
- /**
- * select by primary key
- * @param id primary key
- * @return object by primary key
- */
RmOpenCloseValveLast selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(RmOpenCloseValveLast record);
+
+ int updateByPrimaryKey(RmOpenCloseValveLast record);
/**
* select by rtuAddr
+ *
* @param rtuAddr rtuAddr
* @return object by rtuAddr
*/
- List<RmOpenCloseValveLast> selectByRtuAddr(String rtuAddr);
-
- /**
- * update record selective
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKeySelective(RmOpenCloseValveLast record);
-
- /**
- * update record
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKey(RmOpenCloseValveLast record);
+ //List<RmOpenCloseValveLast> selectByRtuAddr(String rtuAddr);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index 8cc409c..0f0e31f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -5,7 +5,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd84Vo;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd85Vo;
+import com.dy.common.util.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
@@ -13,155 +16,201 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/2/23 15:42
- * @LastEditTime 2024/2/23 15:42
- * @Description 鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁
+ * @author ZhuBaoMin
+ * @date 2024-06-17 11:27
+ * @LastEditTime 2024-06-17 11:27
+ * @Description
*/
-@TableName(value="rm_open_close_valve_report", autoResultMap = true)
+
+/**
+ * 寮�鍏抽榾鎶ュ巻鍙叉暟鎹〃
+ */
+
+@TableName(value="rm_open_close_valve_history", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁")
-public class RmOpenCloseValveHistory implements BaseEntity {
+@Schema(name = "寮�鍏抽榾鎶ュ巻鍙叉暟鎹〃")
+public class RmOpenCloseValveHistory {
+ public static final long serialVersionUID = 202406171339001L;
- public static final long serialVersionUID = 202402231450001L;
/**
* 涓婚敭
*/
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- public Long id;
+ private Long id;
+
/**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerId;
+ private Long controllerId;
/**
- * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
- */
- @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeId;
+ private Long intakeId;
/**
- * 鎺у埗鍣ㄥ湴鍧�
- */
- @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
- public String rtuAddr;
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
+ private String rtuAddr;
/**
- * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
- @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opDt;
+ private Date opDt;
/**
- * 寮�闃�绫诲瀷
- */
- @Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte opType;
+ * 寮�闃�鎺у埗鍣ㄦ椂閽�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date opRtuDt;
/**
- * 寮�闃�鏃剁疮璁℃祦閲�
- */
- @Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opTotalAmount;
+ * IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
+ */
+ private String opIcCardAddr;
/**
- * 寮�闃�IC鍗＄紪鍙�
- */
- @Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opIcCardNo;
+ * IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
+ */
+ private String opIcCardNo;
/**
- * 寮�闃�ic鍗″湴鍧�
- */
- @Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opIcCardAddr;
+ * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ private String opOrderNo;
/**
- * 寮�闃�鏃跺墿浣欓噾棰�
- */
- @Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opRemainMoney;
+ * 寮�娉�/闃�鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date openDt;
/**
- * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
- */
- @Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date openDt;
+ * 寮�闃�姘磋〃绱姘撮噺
+ */
+ private Double opWaterTotalAmount;
/**
- * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
- @Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date clDt;
+ * 寮�闃�鐢佃〃绱鐢甸噺
+ */
+ private Double opEleTotalAmount;
/**
- * 鍏抽榾绫诲瀷
- */
- @Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte clType;
+ * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
+ */
+ private Double opMoneyRemainUser;
/**
- * 鍏抽榾鏃剁疮璁℃祦閲�
- */
- @Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clTotalAmount;
+ * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ private Double opWaterRemainUser;
/**
- * 鍏抽榾鏃禝C鍗＄紪鍙�
- */
- @Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String clIcCardNo;
+ * 鍏虫车/闃�鏂瑰紡
+ */
+ private Byte opType;
/**
- * 鍏抽榾鏃禝C鍗″湴鍧�
- */
- @Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String clIcCardAddr;
+ * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
+ */
+ private String clIcCardAddr;
/**
- * 鍏抽榾鏃跺墿浣欓噾棰�
- */
- @Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clRemainMoney;
+ * 鍏抽榾IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
+ */
+ private String clIcCardNo;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
- */
- @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clThisAmount;
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ private String clOrderNo;
/**
- * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
- */
- @Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clThisMoney;
+ * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startDt;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
- */
- @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer clThisTime;
+ * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endDt;
/**
- * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
- */
- @Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date clOpenDt;
+ * 姘磋〃绱娴侀噺
+ */
+ private Double clWaterTotalAmount;
/**
- * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
- */
- @Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date closeDt;
+ * 鐢佃〃绱鐢甸噺
+ */
+ private Double clEleTotalAmount;
+ /**
+ * 鐢ㄦ埛鍓╀綑閲戦
+ */
+ private Double clMoneyRemainUser;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ private Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ private Double thisEle;
+
+ /**
+ * 鏈浣跨敤姘撮噺
+ */
+ private Double thisWater;
+
+ /**
+ * 鏈浣跨敤閲戦
+ */
+ private Double thisMoney;
+
+ /**
+ * 鏈浣跨敤鏃堕棿闀�
+ */
+ private Integer thisDuration;
+
+ public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception{
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.opDt);
+ this.opIcCardAddr = cdData.icCardAddr;;
+ this.opIcCardNo = cdData.icCardNo;
+ this.opOrderNo = cdData.orderNo;
+ this.opWaterTotalAmount = cdData.waterTotalAmount;
+ this.opEleTotalAmount = cdData.eleTotalAmount;
+ this.opMoneyRemainUser = cdData.moneyRemainUser;
+ this.opWaterRemainUser = cdData.waterRemainUser;
+ }
+
+ public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception{
+ this.startDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
+ this.endDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);
+ this.opType = cdData.opType;
+ this.clIcCardAddr = cdData.icCardAddr;
+ this.clIcCardNo = cdData.icCardNo;
+ this.clOrderNo = cdData.orderNo;
+ this.clWaterTotalAmount = cdData.waterTotalAmount;
+ this.clEleTotalAmount = cdData.eleTotalAmount;
+ this.clMoneyRemainUser = cdData.moneyRemain;;
+ this.clWaterRemainUser = cdData.waterRemain;
+ this.thisEle = cdData.thisEle;
+ this.thisWater = cdData.thisWater;
+ this.thisMoney = cdData.thisMoney;
+ this.thisDuration = cdData.thisDuration;;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
index 96d29d6..bf9fa43 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
@@ -1,175 +1,380 @@
package com.dy.pipIrrGlobal.pojoRm;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/2/23 16:00
- * @LastEditTime 2024/2/23 16:00
+ * @author ZhuBaoMin
+ * @date 2024-06-17 11:28
+ * @LastEditTime 2024-06-17 11:28
* @Description
*/
-@TableName(value="rm_open_close_valve_last", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏈�鏂版暟鎹�")
-public class RmOpenCloseValveLast {
+/**
+ * 寮�鍏抽榾鎶ユ渶鏂版暟鎹〃
+ */
+public class RmOpenCloseValveLast {
public static final long serialVersionUID = 202402231602001L;
/**
* 涓婚敭
*/
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
- /**
- * 鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
- * json涓嶅簭鍒楀寲姝ゅ睘鎬э紝鍗充笉鍚戝墠绔〉闈㈠彂閫佸強鏄剧ず
- */
- @Schema(hidden=true)
- @JSONField(serialize = false)
- public Long lastHistoryId;
+ private Long id;
/**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerId;
+ private Long controllerId;
/**
* 鍙栨按鍙ｅ疄浣揑D锛堝閿級
*/
- @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeId;
+ private Long intakeId;
/**
* 鎺у埗鍣ㄥ湴鍧�
*/
- @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
- public String rtuAddr;
+ private String rtuAddr;
/**
* 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
*/
- @Schema(description = "寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opDt;
+ private Date opDt;
/**
- * 寮�闃�绫诲瀷
+ * 寮�闃�鎺у埗鍣ㄦ椂閽�
*/
- @Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte opType;
+ private Date opRtuDt;
/**
- * 寮�闃�鏃剁疮璁℃祦閲�
+ * IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
*/
- @Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opTotalAmount;
+ private String opIcCardAddr;
/**
- * 寮�闃�IC鍗＄紪鍙�
+ * IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
*/
- @Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opIcCardNo;
+ private String opIcCardNo;
/**
- * 寮�闃�ic鍗″湴鍧�
+ * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
*/
- @Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String opIcCardAddr;
+ private String opOrderNo;
/**
- * 寮�闃�鏃跺墿浣欓噾棰�
+ * 寮�娉�/闃�鏃堕棿
*/
- @Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double opRemainMoney;
+ private Date openDt;
/**
- * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
+ * 寮�闃�姘磋〃绱姘撮噺
*/
- @Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date openDt;
+ private Double opWaterTotalAmount;
/**
- * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ * 寮�闃�鐢佃〃绱鐢甸噺
*/
- @Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date clDt;
+ private Double opEleTotalAmount;
/**
- * 鍏抽榾绫诲瀷
+ * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
*/
- @Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte clType;
+ private Double opMoneyRemainUser;
/**
- * 鍏抽榾鏃剁疮璁℃祦閲�
+ * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
*/
- @Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clTotalAmount;
+ private Double opWaterRemainUser;
/**
- * 鍏抽榾鏃禝C鍗＄紪鍙�
+ * 鍏虫车/闃�鏂瑰紡
*/
- @Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String clIcCardNo;
+ private String opType;
/**
- * 鍏抽榾鏃禝C鍗″湴鍧�
+ * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
*/
- @Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String clIcCardAddr;
+ private String clIcCardAddr;
/**
- * 鍏抽榾鏃跺墿浣欓噾棰�
+ * 鍏抽榾IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
*/
- @Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clRemainMoney;
+ private String clIcCardNo;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
*/
- @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clThisAmount;
+ private String clOrderNo;
/**
- * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
+ * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
*/
- @Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double clThisMoney;
+ private Date startDt;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
*/
- @Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer clThisTime;
+ private Date endDt;
/**
- * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
+ * 姘磋〃绱娴侀噺
*/
- @Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date clOpenDt;
+ private Double clWaterTotalAmount;
/**
- * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
+ * 鐢佃〃绱鐢甸噺
*/
- @Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Date closeDt;
+ private Double clEleTotalAmount;
+ /**
+ * 鐢ㄦ埛鍓╀綑閲戦
+ */
+ private Double clMoneyRemainUser;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ private Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ private Double thisEle;
+
+ /**
+ * 鏈浣跨敤姘撮噺
+ */
+ private Double thisWater;
+
+ /**
+ * 鏈浣跨敤閲戦
+ */
+ private Double thisMoney;
+
+ /**
+ * 鏈浣跨敤鏃堕棿闀�
+ */
+ private Integer thisDuration;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getControllerId() {
+ return controllerId;
+ }
+
+ public void setControllerId(Long controllerId) {
+ this.controllerId = controllerId;
+ }
+
+ public Long getIntakeId() {
+ return intakeId;
+ }
+
+ public void setIntakeId(Long intakeId) {
+ this.intakeId = intakeId;
+ }
+
+ public String getRtuAddr() {
+ return rtuAddr;
+ }
+
+ public void setRtuAddr(String rtuAddr) {
+ this.rtuAddr = rtuAddr;
+ }
+
+ public Date getOpDt() {
+ return opDt;
+ }
+
+ public void setOpDt(Date opDt) {
+ this.opDt = opDt;
+ }
+
+ public Date getOpRtuDt() {
+ return opRtuDt;
+ }
+
+ public void setOpRtuDt(Date opRtuDt) {
+ this.opRtuDt = opRtuDt;
+ }
+
+ public String getOpIcCardAddr() {
+ return opIcCardAddr;
+ }
+
+ public void setOpIcCardAddr(String opIcCardAddr) {
+ this.opIcCardAddr = opIcCardAddr;
+ }
+
+ public String getOpIcCardNo() {
+ return opIcCardNo;
+ }
+
+ public void setOpIcCardNo(String opIcCardNo) {
+ this.opIcCardNo = opIcCardNo;
+ }
+
+ public String getOpOrderNo() {
+ return opOrderNo;
+ }
+
+ public void setOpOrderNo(String opOrderNo) {
+ this.opOrderNo = opOrderNo;
+ }
+
+ public Date getOpenDt() {
+ return openDt;
+ }
+
+ public void setOpenDt(Date openDt) {
+ this.openDt = openDt;
+ }
+
+ public Double getOpWaterTotalAmount() {
+ return opWaterTotalAmount;
+ }
+
+ public void setOpWaterTotalAmount(Double opWaterTotalAmount) {
+ this.opWaterTotalAmount = opWaterTotalAmount;
+ }
+
+ public Double getOpEleTotalAmount() {
+ return opEleTotalAmount;
+ }
+
+ public void setOpEleTotalAmount(Double opEleTotalAmount) {
+ this.opEleTotalAmount = opEleTotalAmount;
+ }
+
+ public Double getOpMoneyRemainUser() {
+ return opMoneyRemainUser;
+ }
+
+ public void setOpMoneyRemainUser(Double opMoneyRemainUser) {
+ this.opMoneyRemainUser = opMoneyRemainUser;
+ }
+
+ public Double getOpWaterRemainUser() {
+ return opWaterRemainUser;
+ }
+
+ public void setOpWaterRemainUser(Double opWaterRemainUser) {
+ this.opWaterRemainUser = opWaterRemainUser;
+ }
+
+ public String getOpType() {
+ return opType;
+ }
+
+ public void setOpType(String opType) {
+ this.opType = opType;
+ }
+
+ public String getClIcCardAddr() {
+ return clIcCardAddr;
+ }
+
+ public void setClIcCardAddr(String clIcCardAddr) {
+ this.clIcCardAddr = clIcCardAddr;
+ }
+
+ public String getClIcCardNo() {
+ return clIcCardNo;
+ }
+
+ public void setClIcCardNo(String clIcCardNo) {
+ this.clIcCardNo = clIcCardNo;
+ }
+
+ public String getClOrderNo() {
+ return clOrderNo;
+ }
+
+ public void setClOrderNo(String clOrderNo) {
+ this.clOrderNo = clOrderNo;
+ }
+
+ public Date getStartDt() {
+ return startDt;
+ }
+
+ public void setStartDt(Date startDt) {
+ this.startDt = startDt;
+ }
+
+ public Date getEndDt() {
+ return endDt;
+ }
+
+ public void setEndDt(Date endDt) {
+ this.endDt = endDt;
+ }
+
+ public Double getClWaterTotalAmount() {
+ return clWaterTotalAmount;
+ }
+
+ public void setClWaterTotalAmount(Double clWaterTotalAmount) {
+ this.clWaterTotalAmount = clWaterTotalAmount;
+ }
+
+ public Double getClEleTotalAmount() {
+ return clEleTotalAmount;
+ }
+
+ public void setClEleTotalAmount(Double clEleTotalAmount) {
+ this.clEleTotalAmount = clEleTotalAmount;
+ }
+
+ public Double getClMoneyRemainUser() {
+ return clMoneyRemainUser;
+ }
+
+ public void setClMoneyRemainUser(Double clMoneyRemainUser) {
+ this.clMoneyRemainUser = clMoneyRemainUser;
+ }
+
+ public Double getClWaterRemainUser() {
+ return clWaterRemainUser;
+ }
+
+ public void setClWaterRemainUser(Double clWaterRemainUser) {
+ this.clWaterRemainUser = clWaterRemainUser;
+ }
+
+ public Double getThisEle() {
+ return thisEle;
+ }
+
+ public void setThisEle(Double thisEle) {
+ this.thisEle = thisEle;
+ }
+
+ public Double getThisWater() {
+ return thisWater;
+ }
+
+ public void setThisWater(Double thisWater) {
+ this.thisWater = thisWater;
+ }
+
+ public Double getThisMoney() {
+ return thisMoney;
+ }
+
+ public void setThisMoney(Double thisMoney) {
+ this.thisMoney = thisMoney;
+ }
+
+ public Integer getThisDuration() {
+ return thisDuration;
+ }
+
+ public void setThisDuration(Integer thisDuration) {
+ this.thisDuration = thisDuration;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index f1de3dd..5d82bb0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -9,30 +9,37 @@
<result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="op_dt" jdbcType="TIMESTAMP" property="opDt" />
- <result column="op_type" jdbcType="TINYINT" property="opType" />
- <result column="op_total_amount" jdbcType="DOUBLE" property="opTotalAmount" />
- <result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
+ <result column="op_rtu_dt" jdbcType="TIMESTAMP" property="opRtuDt" />
<result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
- <result column="op_remain_money" jdbcType="DOUBLE" property="opRemainMoney" />
+ <result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
+ <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
<result column="open_dt" jdbcType="TIMESTAMP" property="openDt" />
- <result column="cl_dt" jdbcType="TIMESTAMP" property="clDt" />
- <result column="cl_type" jdbcType="TINYINT" property="clType" />
- <result column="cl_total_amount" jdbcType="DOUBLE" property="clTotalAmount" />
- <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
+ <result column="op_water_total_amount" jdbcType="FLOAT" property="opWaterTotalAmount" />
+ <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
+ <result column="op_money_remain_user" jdbcType="FLOAT" property="opMoneyRemainUser" />
+ <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
+ <result column="op_type" jdbcType="VARCHAR" property="opType" />
<result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
- <result column="cl_remain_money" jdbcType="DOUBLE" property="clRemainMoney" />
- <result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount" />
- <result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney" />
- <result column="cl_this_time" jdbcType="INTEGER" property="clThisTime" />
- <result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt" />
- <result column="close_dt" jdbcType="TIMESTAMP" property="closeDt" />
+ <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
+ <result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo" />
+ <result column="start_dt" jdbcType="TIMESTAMP" property="startDt" />
+ <result column="end_dt" jdbcType="TIMESTAMP" property="endDt" />
+ <result column="cl_water_total_amount" jdbcType="FLOAT" property="clWaterTotalAmount" />
+ <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
+ <result column="cl_money_remain_user" jdbcType="FLOAT" property="clMoneyRemainUser" />
+ <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
+ <result column="this_ele" jdbcType="FLOAT" property="thisEle" />
+ <result column="this_water" jdbcType="FLOAT" property="thisWater" />
+ <result column="this_money" jdbcType="FLOAT" property="thisMoney" />
+ <result column="this_duration" jdbcType="INTEGER" property="thisDuration" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount, op_ic_card_no,
- op_ic_card_addr, op_remain_money, open_dt, cl_dt, cl_type, cl_total_amount, cl_ic_card_no,
- cl_ic_card_addr, cl_remain_money, cl_this_amount, cl_this_money, cl_this_time, cl_open_dt,
- close_dt
+ id, controller_id, intake_id, rtu_addr, op_dt, op_rtu_dt, op_ic_card_addr, op_ic_card_no,
+ op_order_no, open_dt, op_water_total_amount, op_ele_total_amount, op_money_remain_user,
+ op_water_remain_user, op_type, cl_ic_card_addr, cl_ic_card_no, cl_order_no, start_dt,
+ end_dt, cl_water_total_amount, cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user,
+ this_ele, this_water, this_money, this_duration
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -49,21 +56,25 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
<!--@mbg.generated-->
insert into rm_open_close_valve_history (id, controller_id, intake_id,
- rtu_addr, op_dt, op_type,
- op_total_amount, op_ic_card_no, op_ic_card_addr,
- op_remain_money, open_dt, cl_dt,
- cl_type, cl_total_amount, cl_ic_card_no,
- cl_ic_card_addr, cl_remain_money, cl_this_amount,
- cl_this_money, cl_this_time, cl_open_dt,
- close_dt)
+ rtu_addr, op_dt, op_rtu_dt,
+ op_ic_card_addr, op_ic_card_no, op_order_no,
+ open_dt, op_water_total_amount, op_ele_total_amount,
+ op_money_remain_user, op_water_remain_user, op_type,
+ cl_ic_card_addr, cl_ic_card_no, cl_order_no,
+ start_dt, end_dt, cl_water_total_amount,
+ cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user,
+ this_ele, this_water, this_money,
+ this_duration)
values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, #{opType,jdbcType=TINYINT},
- #{opTotalAmount,jdbcType=DOUBLE}, #{opIcCardNo,jdbcType=VARCHAR}, #{opIcCardAddr,jdbcType=VARCHAR},
- #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP}, #{clDt,jdbcType=TIMESTAMP},
- #{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE}, #{clIcCardNo,jdbcType=VARCHAR},
- #{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE}, #{clThisAmount,jdbcType=DOUBLE},
- #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER}, #{clOpenDt,jdbcType=TIMESTAMP},
- #{closeDt,jdbcType=TIMESTAMP})
+ #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, #{opRtuDt,jdbcType=TIMESTAMP},
+ #{opIcCardAddr,jdbcType=VARCHAR}, #{opIcCardNo,jdbcType=VARCHAR}, #{opOrderNo,jdbcType=VARCHAR},
+ #{openDt,jdbcType=TIMESTAMP}, #{opWaterTotalAmount,jdbcType=FLOAT}, #{opEleTotalAmount,jdbcType=FLOAT},
+ #{opMoneyRemainUser,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{opType,jdbcType=VARCHAR},
+ #{clIcCardAddr,jdbcType=VARCHAR}, #{clIcCardNo,jdbcType=VARCHAR}, #{clOrderNo,jdbcType=VARCHAR},
+ #{startDt,jdbcType=TIMESTAMP}, #{endDt,jdbcType=TIMESTAMP}, #{clWaterTotalAmount,jdbcType=FLOAT},
+ #{clEleTotalAmount,jdbcType=FLOAT}, #{clMoneyRemainUser,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT},
+ #{thisEle,jdbcType=FLOAT}, #{thisWater,jdbcType=FLOAT}, #{thisMoney,jdbcType=FLOAT},
+ #{thisDuration,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
<!--@mbg.generated-->
@@ -84,56 +95,74 @@
<if test="opDt != null">
op_dt,
</if>
- <if test="opType != null">
- op_type,
- </if>
- <if test="opTotalAmount != null">
- op_total_amount,
- </if>
- <if test="opIcCardNo != null">
- op_ic_card_no,
+ <if test="opRtuDt != null">
+ op_rtu_dt,
</if>
<if test="opIcCardAddr != null">
op_ic_card_addr,
</if>
- <if test="opRemainMoney != null">
- op_remain_money,
+ <if test="opIcCardNo != null">
+ op_ic_card_no,
+ </if>
+ <if test="opOrderNo != null">
+ op_order_no,
</if>
<if test="openDt != null">
open_dt,
</if>
- <if test="clDt != null">
- cl_dt,
+ <if test="opWaterTotalAmount != null">
+ op_water_total_amount,
</if>
- <if test="clType != null">
- cl_type,
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount,
</if>
- <if test="clTotalAmount != null">
- cl_total_amount,
+ <if test="opMoneyRemainUser != null">
+ op_money_remain_user,
</if>
- <if test="clIcCardNo != null">
- cl_ic_card_no,
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user,
+ </if>
+ <if test="opType != null">
+ op_type,
</if>
<if test="clIcCardAddr != null">
cl_ic_card_addr,
</if>
- <if test="clRemainMoney != null">
- cl_remain_money,
+ <if test="clIcCardNo != null">
+ cl_ic_card_no,
</if>
- <if test="clThisAmount != null">
- cl_this_amount,
+ <if test="clOrderNo != null">
+ cl_order_no,
</if>
- <if test="clThisMoney != null">
- cl_this_money,
+ <if test="startDt != null">
+ start_dt,
</if>
- <if test="clThisTime != null">
- cl_this_time,
+ <if test="endDt != null">
+ end_dt,
</if>
- <if test="clOpenDt != null">
- cl_open_dt,
+ <if test="clWaterTotalAmount != null">
+ cl_water_total_amount,
</if>
- <if test="closeDt != null">
- close_dt,
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount,
+ </if>
+ <if test="clMoneyRemainUser != null">
+ cl_money_remain_user,
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user,
+ </if>
+ <if test="thisEle != null">
+ this_ele,
+ </if>
+ <if test="thisWater != null">
+ this_water,
+ </if>
+ <if test="thisMoney != null">
+ this_money,
+ </if>
+ <if test="thisDuration != null">
+ this_duration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -152,56 +181,74 @@
<if test="opDt != null">
#{opDt,jdbcType=TIMESTAMP},
</if>
- <if test="opType != null">
- #{opType,jdbcType=TINYINT},
- </if>
- <if test="opTotalAmount != null">
- #{opTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="opIcCardNo != null">
- #{opIcCardNo,jdbcType=VARCHAR},
+ <if test="opRtuDt != null">
+ #{opRtuDt,jdbcType=TIMESTAMP},
</if>
<if test="opIcCardAddr != null">
#{opIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="opRemainMoney != null">
- #{opRemainMoney,jdbcType=DOUBLE},
+ <if test="opIcCardNo != null">
+ #{opIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opOrderNo != null">
+ #{opOrderNo,jdbcType=VARCHAR},
</if>
<if test="openDt != null">
#{openDt,jdbcType=TIMESTAMP},
</if>
- <if test="clDt != null">
- #{clDt,jdbcType=TIMESTAMP},
+ <if test="opWaterTotalAmount != null">
+ #{opWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clType != null">
- #{clType,jdbcType=TINYINT},
+ <if test="opEleTotalAmount != null">
+ #{opEleTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clTotalAmount != null">
- #{clTotalAmount,jdbcType=DOUBLE},
+ <if test="opMoneyRemainUser != null">
+ #{opMoneyRemainUser,jdbcType=FLOAT},
</if>
- <if test="clIcCardNo != null">
- #{clIcCardNo,jdbcType=VARCHAR},
+ <if test="opWaterRemainUser != null">
+ #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="opType != null">
+ #{opType,jdbcType=VARCHAR},
</if>
<if test="clIcCardAddr != null">
#{clIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="clRemainMoney != null">
- #{clRemainMoney,jdbcType=DOUBLE},
+ <if test="clIcCardNo != null">
+ #{clIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="clThisAmount != null">
- #{clThisAmount,jdbcType=DOUBLE},
+ <if test="clOrderNo != null">
+ #{clOrderNo,jdbcType=VARCHAR},
</if>
- <if test="clThisMoney != null">
- #{clThisMoney,jdbcType=DOUBLE},
+ <if test="startDt != null">
+ #{startDt,jdbcType=TIMESTAMP},
</if>
- <if test="clThisTime != null">
- #{clThisTime,jdbcType=INTEGER},
+ <if test="endDt != null">
+ #{endDt,jdbcType=TIMESTAMP},
</if>
- <if test="clOpenDt != null">
- #{clOpenDt,jdbcType=TIMESTAMP},
+ <if test="clWaterTotalAmount != null">
+ #{clWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="closeDt != null">
- #{closeDt,jdbcType=TIMESTAMP},
+ <if test="clEleTotalAmount != null">
+ #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clMoneyRemainUser != null">
+ #{clMoneyRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="thisEle != null">
+ #{thisEle,jdbcType=FLOAT},
+ </if>
+ <if test="thisWater != null">
+ #{thisWater,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoney != null">
+ #{thisMoney,jdbcType=FLOAT},
+ </if>
+ <if test="thisDuration != null">
+ #{thisDuration,jdbcType=INTEGER},
</if>
</trim>
</insert>
@@ -221,56 +268,74 @@
<if test="opDt != null">
op_dt = #{opDt,jdbcType=TIMESTAMP},
</if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=TINYINT},
- </if>
- <if test="opTotalAmount != null">
- op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="opIcCardNo != null">
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ <if test="opRtuDt != null">
+ op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
</if>
<if test="opIcCardAddr != null">
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="opRemainMoney != null">
- op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
+ <if test="opIcCardNo != null">
+ op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opOrderNo != null">
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
</if>
<if test="openDt != null">
open_dt = #{openDt,jdbcType=TIMESTAMP},
</if>
- <if test="clDt != null">
- cl_dt = #{clDt,jdbcType=TIMESTAMP},
+ <if test="opWaterTotalAmount != null">
+ op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clType != null">
- cl_type = #{clType,jdbcType=TINYINT},
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clTotalAmount != null">
- cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
+ <if test="opMoneyRemainUser != null">
+ op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
</if>
- <if test="clIcCardNo != null">
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="opType != null">
+ op_type = #{opType,jdbcType=VARCHAR},
</if>
<if test="clIcCardAddr != null">
cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="clRemainMoney != null">
- cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
+ <if test="clIcCardNo != null">
+ cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="clThisAmount != null">
- cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
+ <if test="clOrderNo != null">
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
</if>
- <if test="clThisMoney != null">
- cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
+ <if test="startDt != null">
+ start_dt = #{startDt,jdbcType=TIMESTAMP},
</if>
- <if test="clThisTime != null">
- cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ <if test="endDt != null">
+ end_dt = #{endDt,jdbcType=TIMESTAMP},
</if>
- <if test="clOpenDt != null">
- cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
+ <if test="clWaterTotalAmount != null">
+ cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="closeDt != null">
- close_dt = #{closeDt,jdbcType=TIMESTAMP},
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clMoneyRemainUser != null">
+ cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="thisEle != null">
+ this_ele = #{thisEle,jdbcType=FLOAT},
+ </if>
+ <if test="thisWater != null">
+ this_water = #{thisWater,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoney != null">
+ this_money = #{thisMoney,jdbcType=FLOAT},
+ </if>
+ <if test="thisDuration != null">
+ this_duration = #{thisDuration,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -282,23 +347,29 @@
intake_id = #{intakeId,jdbcType=BIGINT},
rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_type = #{opType,jdbcType=TINYINT},
- op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
- op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
+ op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
open_dt = #{openDt,jdbcType=TIMESTAMP},
- cl_dt = #{clDt,jdbcType=TIMESTAMP},
- cl_type = #{clType,jdbcType=TINYINT},
- cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ op_type = #{opType,jdbcType=VARCHAR},
cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
- cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
- cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
- cl_this_time = #{clThisTime,jdbcType=INTEGER},
- cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- close_dt = #{closeDt,jdbcType=TIMESTAMP}
+ cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ start_dt = #{startDt,jdbcType=TIMESTAMP},
+ end_dt = #{endDt,jdbcType=TIMESTAMP},
+ cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ this_ele = #{thisEle,jdbcType=FLOAT},
+ this_water = #{thisWater,jdbcType=FLOAT},
+ this_money = #{thisMoney,jdbcType=FLOAT},
+ this_duration = #{thisDuration,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 0ffaefd..34d58a7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -5,35 +5,41 @@
<!--@mbg.generated-->
<!--@Table rm_open_close_valve_last-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="last_history_id" jdbcType="BIGINT" property="lastHistoryId" />
<result column="controller_id" jdbcType="BIGINT" property="controllerId" />
<result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="op_dt" jdbcType="TIMESTAMP" property="opDt" />
- <result column="op_type" jdbcType="TINYINT" property="opType" />
- <result column="op_total_amount" jdbcType="DOUBLE" property="opTotalAmount" />
- <result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
+ <result column="op_rtu_dt" jdbcType="TIMESTAMP" property="opRtuDt" />
<result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
- <result column="op_remain_money" jdbcType="DOUBLE" property="opRemainMoney" />
+ <result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
+ <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
<result column="open_dt" jdbcType="TIMESTAMP" property="openDt" />
- <result column="cl_dt" jdbcType="TIMESTAMP" property="clDt" />
- <result column="cl_type" jdbcType="TINYINT" property="clType" />
- <result column="cl_total_amount" jdbcType="DOUBLE" property="clTotalAmount" />
- <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
+ <result column="op_water_total_amount" jdbcType="FLOAT" property="opWaterTotalAmount" />
+ <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
+ <result column="op_money_remain_user" jdbcType="FLOAT" property="opMoneyRemainUser" />
+ <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
+ <result column="op_type" jdbcType="VARCHAR" property="opType" />
<result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
- <result column="cl_remain_money" jdbcType="DOUBLE" property="clRemainMoney" />
- <result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount" />
- <result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney" />
- <result column="cl_this_time" jdbcType="INTEGER" property="clThisTime" />
- <result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt" />
- <result column="close_dt" jdbcType="TIMESTAMP" property="closeDt" />
+ <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
+ <result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo" />
+ <result column="start_dt" jdbcType="TIMESTAMP" property="startDt" />
+ <result column="end_dt" jdbcType="TIMESTAMP" property="endDt" />
+ <result column="cl_water_total_amount" jdbcType="FLOAT" property="clWaterTotalAmount" />
+ <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
+ <result column="cl_money_remain_user" jdbcType="FLOAT" property="clMoneyRemainUser" />
+ <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
+ <result column="this_ele" jdbcType="FLOAT" property="thisEle" />
+ <result column="this_water" jdbcType="FLOAT" property="thisWater" />
+ <result column="this_money" jdbcType="FLOAT" property="thisMoney" />
+ <result column="this_duration" jdbcType="INTEGER" property="thisDuration" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, last_history_id, controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount, op_ic_card_no,
- op_ic_card_addr, op_remain_money, open_dt, cl_dt, cl_type, cl_total_amount, cl_ic_card_no,
- cl_ic_card_addr, cl_remain_money, cl_this_amount, cl_this_money, cl_this_time, cl_open_dt,
- close_dt
+ id, controller_id, intake_id, rtu_addr, op_dt, op_rtu_dt, op_ic_card_addr, op_ic_card_no,
+ op_order_no, open_dt, op_water_total_amount, op_ele_total_amount, op_money_remain_user,
+ op_water_remain_user, op_type, cl_ic_card_addr, cl_ic_card_no, cl_order_no, start_dt,
+ end_dt, cl_water_total_amount, cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user,
+ this_ele, this_water, this_money, this_duration
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -42,14 +48,6 @@
from rm_open_close_valve_last
where id = #{id,jdbcType=BIGINT}
</select>
-
- <select id="selectByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from rm_open_close_valve_last
- where rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
- </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from rm_open_close_valve_last
@@ -57,22 +55,26 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
- insert into rm_open_close_valve_last (id, last_history_id, controller_id, intake_id,
- rtu_addr, op_dt, op_type,
- op_total_amount, op_ic_card_no, op_ic_card_addr,
- op_remain_money, open_dt, cl_dt,
- cl_type, cl_total_amount, cl_ic_card_no,
- cl_ic_card_addr, cl_remain_money, cl_this_amount,
- cl_this_money, cl_this_time, cl_open_dt,
- close_dt)
- values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT},
- #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP},
- #{opType,jdbcType=TINYINT}, #{opTotalAmount,jdbcType=DOUBLE}, #{opIcCardNo,jdbcType=VARCHAR},
- #{opIcCardAddr,jdbcType=VARCHAR}, #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP},
- #{clDt,jdbcType=TIMESTAMP}, #{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE},
- #{clIcCardNo,jdbcType=VARCHAR}, #{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE},
- #{clThisAmount,jdbcType=DOUBLE}, #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER},
- #{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP})
+ insert into rm_open_close_valve_last (id, controller_id, intake_id,
+ rtu_addr, op_dt, op_rtu_dt,
+ op_ic_card_addr, op_ic_card_no, op_order_no,
+ open_dt, op_water_total_amount, op_ele_total_amount,
+ op_money_remain_user, op_water_remain_user, op_type,
+ cl_ic_card_addr, cl_ic_card_no, cl_order_no,
+ start_dt, end_dt, cl_water_total_amount,
+ cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user,
+ this_ele, this_water, this_money,
+ this_duration)
+ values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, #{opRtuDt,jdbcType=TIMESTAMP},
+ #{opIcCardAddr,jdbcType=VARCHAR}, #{opIcCardNo,jdbcType=VARCHAR}, #{opOrderNo,jdbcType=VARCHAR},
+ #{openDt,jdbcType=TIMESTAMP}, #{opWaterTotalAmount,jdbcType=FLOAT}, #{opEleTotalAmount,jdbcType=FLOAT},
+ #{opMoneyRemainUser,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{opType,jdbcType=VARCHAR},
+ #{clIcCardAddr,jdbcType=VARCHAR}, #{clIcCardNo,jdbcType=VARCHAR}, #{clOrderNo,jdbcType=VARCHAR},
+ #{startDt,jdbcType=TIMESTAMP}, #{endDt,jdbcType=TIMESTAMP}, #{clWaterTotalAmount,jdbcType=FLOAT},
+ #{clEleTotalAmount,jdbcType=FLOAT}, #{clMoneyRemainUser,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT},
+ #{thisEle,jdbcType=FLOAT}, #{thisWater,jdbcType=FLOAT}, #{thisMoney,jdbcType=FLOAT},
+ #{thisDuration,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
@@ -80,9 +82,6 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
- </if>
- <if test="lastHistoryId != null">
- last_history_id,
</if>
<if test="controllerId != null">
controller_id,
@@ -96,64 +95,79 @@
<if test="opDt != null">
op_dt,
</if>
- <if test="opType != null">
- op_type,
- </if>
- <if test="opTotalAmount != null">
- op_total_amount,
- </if>
- <if test="opIcCardNo != null">
- op_ic_card_no,
+ <if test="opRtuDt != null">
+ op_rtu_dt,
</if>
<if test="opIcCardAddr != null">
op_ic_card_addr,
</if>
- <if test="opRemainMoney != null">
- op_remain_money,
+ <if test="opIcCardNo != null">
+ op_ic_card_no,
+ </if>
+ <if test="opOrderNo != null">
+ op_order_no,
</if>
<if test="openDt != null">
open_dt,
</if>
- <if test="clDt != null">
- cl_dt,
+ <if test="opWaterTotalAmount != null">
+ op_water_total_amount,
</if>
- <if test="clType != null">
- cl_type,
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount,
</if>
- <if test="clTotalAmount != null">
- cl_total_amount,
+ <if test="opMoneyRemainUser != null">
+ op_money_remain_user,
</if>
- <if test="clIcCardNo != null">
- cl_ic_card_no,
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user,
+ </if>
+ <if test="opType != null">
+ op_type,
</if>
<if test="clIcCardAddr != null">
cl_ic_card_addr,
</if>
- <if test="clRemainMoney != null">
- cl_remain_money,
+ <if test="clIcCardNo != null">
+ cl_ic_card_no,
</if>
- <if test="clThisAmount != null">
- cl_this_amount,
+ <if test="clOrderNo != null">
+ cl_order_no,
</if>
- <if test="clThisMoney != null">
- cl_this_money,
+ <if test="startDt != null">
+ start_dt,
</if>
- <if test="clThisTime != null">
- cl_this_time,
+ <if test="endDt != null">
+ end_dt,
</if>
- <if test="clOpenDt != null">
- cl_open_dt,
+ <if test="clWaterTotalAmount != null">
+ cl_water_total_amount,
</if>
- <if test="closeDt != null">
- close_dt,
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount,
+ </if>
+ <if test="clMoneyRemainUser != null">
+ cl_money_remain_user,
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user,
+ </if>
+ <if test="thisEle != null">
+ this_ele,
+ </if>
+ <if test="thisWater != null">
+ this_water,
+ </if>
+ <if test="thisMoney != null">
+ this_money,
+ </if>
+ <if test="thisDuration != null">
+ this_duration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
- </if>
- <if test="lastHistoryId != null">
- #{lastHistoryId,jdbcType=BIGINT},
</if>
<if test="controllerId != null">
#{controllerId,jdbcType=BIGINT},
@@ -167,56 +181,74 @@
<if test="opDt != null">
#{opDt,jdbcType=TIMESTAMP},
</if>
- <if test="opType != null">
- #{opType,jdbcType=TINYINT},
- </if>
- <if test="opTotalAmount != null">
- #{opTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="opIcCardNo != null">
- #{opIcCardNo,jdbcType=VARCHAR},
+ <if test="opRtuDt != null">
+ #{opRtuDt,jdbcType=TIMESTAMP},
</if>
<if test="opIcCardAddr != null">
#{opIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="opRemainMoney != null">
- #{opRemainMoney,jdbcType=DOUBLE},
+ <if test="opIcCardNo != null">
+ #{opIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opOrderNo != null">
+ #{opOrderNo,jdbcType=VARCHAR},
</if>
<if test="openDt != null">
#{openDt,jdbcType=TIMESTAMP},
</if>
- <if test="clDt != null">
- #{clDt,jdbcType=TIMESTAMP},
+ <if test="opWaterTotalAmount != null">
+ #{opWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clType != null">
- #{clType,jdbcType=TINYINT},
+ <if test="opEleTotalAmount != null">
+ #{opEleTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clTotalAmount != null">
- #{clTotalAmount,jdbcType=DOUBLE},
+ <if test="opMoneyRemainUser != null">
+ #{opMoneyRemainUser,jdbcType=FLOAT},
</if>
- <if test="clIcCardNo != null">
- #{clIcCardNo,jdbcType=VARCHAR},
+ <if test="opWaterRemainUser != null">
+ #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="opType != null">
+ #{opType,jdbcType=VARCHAR},
</if>
<if test="clIcCardAddr != null">
#{clIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="clRemainMoney != null">
- #{clRemainMoney,jdbcType=DOUBLE},
+ <if test="clIcCardNo != null">
+ #{clIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="clThisAmount != null">
- #{clThisAmount,jdbcType=DOUBLE},
+ <if test="clOrderNo != null">
+ #{clOrderNo,jdbcType=VARCHAR},
</if>
- <if test="clThisMoney != null">
- #{clThisMoney,jdbcType=DOUBLE},
+ <if test="startDt != null">
+ #{startDt,jdbcType=TIMESTAMP},
</if>
- <if test="clThisTime != null">
- #{clThisTime,jdbcType=INTEGER},
+ <if test="endDt != null">
+ #{endDt,jdbcType=TIMESTAMP},
</if>
- <if test="clOpenDt != null">
- #{clOpenDt,jdbcType=TIMESTAMP},
+ <if test="clWaterTotalAmount != null">
+ #{clWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="closeDt != null">
- #{closeDt,jdbcType=TIMESTAMP},
+ <if test="clEleTotalAmount != null">
+ #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clMoneyRemainUser != null">
+ #{clMoneyRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="thisEle != null">
+ #{thisEle,jdbcType=FLOAT},
+ </if>
+ <if test="thisWater != null">
+ #{thisWater,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoney != null">
+ #{thisMoney,jdbcType=FLOAT},
+ </if>
+ <if test="thisDuration != null">
+ #{thisDuration,jdbcType=INTEGER},
</if>
</trim>
</insert>
@@ -224,9 +256,6 @@
<!--@mbg.generated-->
update rm_open_close_valve_last
<set>
- <if test="lastHistoryId != null">
- last_history_id = #{lastHistoryId,jdbcType=BIGINT},
- </if>
<if test="controllerId != null">
controller_id = #{controllerId,jdbcType=BIGINT},
</if>
@@ -239,56 +268,74 @@
<if test="opDt != null">
op_dt = #{opDt,jdbcType=TIMESTAMP},
</if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=TINYINT},
- </if>
- <if test="opTotalAmount != null">
- op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
- </if>
- <if test="opIcCardNo != null">
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ <if test="opRtuDt != null">
+ op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
</if>
<if test="opIcCardAddr != null">
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="opRemainMoney != null">
- op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
+ <if test="opIcCardNo != null">
+ op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opOrderNo != null">
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
</if>
<if test="openDt != null">
open_dt = #{openDt,jdbcType=TIMESTAMP},
</if>
- <if test="clDt != null">
- cl_dt = #{clDt,jdbcType=TIMESTAMP},
+ <if test="opWaterTotalAmount != null">
+ op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clType != null">
- cl_type = #{clType,jdbcType=TINYINT},
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
</if>
- <if test="clTotalAmount != null">
- cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
+ <if test="opMoneyRemainUser != null">
+ op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
</if>
- <if test="clIcCardNo != null">
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="opType != null">
+ op_type = #{opType,jdbcType=VARCHAR},
</if>
<if test="clIcCardAddr != null">
cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
</if>
- <if test="clRemainMoney != null">
- cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
+ <if test="clIcCardNo != null">
+ cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
</if>
- <if test="clThisAmount != null">
- cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
+ <if test="clOrderNo != null">
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
</if>
- <if test="clThisMoney != null">
- cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
+ <if test="startDt != null">
+ start_dt = #{startDt,jdbcType=TIMESTAMP},
</if>
- <if test="clThisTime != null">
- cl_this_time = #{clThisTime,jdbcType=INTEGER},
+ <if test="endDt != null">
+ end_dt = #{endDt,jdbcType=TIMESTAMP},
</if>
- <if test="clOpenDt != null">
- cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
+ <if test="clWaterTotalAmount != null">
+ cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
</if>
- <if test="closeDt != null">
- close_dt = #{closeDt,jdbcType=TIMESTAMP},
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clMoneyRemainUser != null">
+ cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="thisEle != null">
+ this_ele = #{thisEle,jdbcType=FLOAT},
+ </if>
+ <if test="thisWater != null">
+ this_water = #{thisWater,jdbcType=FLOAT},
+ </if>
+ <if test="thisMoney != null">
+ this_money = #{thisMoney,jdbcType=FLOAT},
+ </if>
+ <if test="thisDuration != null">
+ this_duration = #{thisDuration,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -296,28 +343,33 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
update rm_open_close_valve_last
- set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
- controller_id = #{controllerId,jdbcType=BIGINT},
+ set controller_id = #{controllerId,jdbcType=BIGINT},
intake_id = #{intakeId,jdbcType=BIGINT},
rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_type = #{opType,jdbcType=TINYINT},
- op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
- op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
+ op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
open_dt = #{openDt,jdbcType=TIMESTAMP},
- cl_dt = #{clDt,jdbcType=TIMESTAMP},
- cl_type = #{clType,jdbcType=TINYINT},
- cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ op_type = #{opType,jdbcType=VARCHAR},
cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
- cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
- cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
- cl_this_time = #{clThisTime,jdbcType=INTEGER},
- cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- close_dt = #{closeDt,jdbcType=TIMESTAMP}
+ cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ start_dt = #{startDt,jdbcType=TIMESTAMP},
+ end_dt = #{endDt,jdbcType=TIMESTAMP},
+ cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ this_ele = #{thisEle,jdbcType=FLOAT},
+ this_water = #{thisWater,jdbcType=FLOAT},
+ this_money = #{thisMoney,jdbcType=FLOAT},
+ this_duration = #{thisDuration,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
new file mode 100644
index 0000000..18fdf20
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
@@ -0,0 +1,102 @@
+package com.dy.rtuMw.server.rtuData.p206V202404;
+
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd84Vo;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.rtuMw.server.rtuData.TaskSurpport;
+import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-06-17 9:36
+ * @LastEditTime 2024-06-17 9:36
+ * @Description 鎺у埗鍣ㄥ紑闃�涓婃姤(鍔熻兘鐮�84)
+ */
+public class TkDealOpenValveReportV202404 extends TaskSurpport {
+ private static final Logger log = LogManager.getLogger(TkDealTimingReportV202404.class.getName());
+
+ //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
+ public static final String taskId = "TkDealOpenValveReportV202404";
+
+ /**
+ * 鎵ц鑺傜偣浠诲姟锛氬紑闃�涓婃姤
+ *
+ * @param data 闇�瑕佸鐞嗙殑鏁版嵁
+ */
+ @Override
+ public void execute(Object data) {
+ Data d = (Data) data;
+ DataV202404 dV202404 = (DataV202404) d.getSubData();
+ Object cdObj = dV202404.subData;
+ if (cdObj != null) {
+ try {
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ if (cdObj instanceof DataCd84Vo) {
+ DataCd84Vo cdData = (DataCd84Vo) (cdObj);
+ this.doDeal(sv, controller, d.getRtuAddr(), dV202404, (DataCd84Vo)cdObj);
+ }
+ } catch (Exception e) {
+ log.error("淇濆瓨鎺у埗鍣ㄥ紑闃�鎶ユ暟鎹椂鍙戠敓寮傚父", e);
+ }
+ }
+ }
+ /**
+ * 澶勭悊寮�闃�鎶ユ暟鎹�
+ * @param sv 鏈嶅姟
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param dataV202404 鍗忚鏁版嵁
+ * @param cdData 鍔熻兘鏁版嵁
+ */
+ private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {
+ //this.saveOrUpdateLast(sv, controller, rtuAddr, dataV202404, cdData);
+ //this.saveHistory(sv, controller, rtuAddr, dataV202404, cdData);
+ }
+
+ /**
+ * 淇濆瓨鎴栨洿鏂版帶鍒跺櫒寮�闃�鎶ユ渶鏂版暟鎹�
+ * @param sv 鏈嶅姟bean
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param dataV202404 鍗忚鏁版嵁
+ * @param cdData 鍔熻兘鏁版嵁
+ */
+ //private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
+ // RmTimingReportLast po = sv.getRmTimingReportLast(rtuAddr) ;
+ // if(po == null){
+ // po = new RmTimingReportLast();
+ // po.controllerId = controller==null?null:controller.getId();
+ // po.intakeId = controller==null?null:controller.getIntakeId();
+ // po.rtuAddr = rtuAddr;
+ // po.valueFrom(dataV202404, cdData);
+ // sv.saveRmTimingReportLast(po) ;
+ // }else{
+ // po.controllerId = controller==null?null:controller.getId();
+ // po.intakeId = controller==null?null:controller.getIntakeId();
+ // po.valueFrom(dataV202404, cdData);
+ // sv.updateRmTimingReportLast(po);
+ // }
+ //}
+
+ /**
+ * 淇濆瓨鎺у埗鍣ㄥ伐浣滄姤鍘嗗彶鏁版嵁
+ * @param sv 鏈嶅姟bean
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param dataV202404 鍗忚鏁版嵁
+ * @param cdData 鍔熻兘鏁版嵁
+ */
+ //private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
+ // RmTimingReportHistory po = new RmTimingReportHistory();
+ // po.controllerId = controller==null?null:controller.getId();
+ // po.intakeId = controller==null?null:controller.getIntakeId();
+ // po.rtuAddr = rtuAddr;
+ // po.valueFrom(dataV202404, cdData);
+ // sv.saveRmTimingReportHistory(po); ;
+ //}
+}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
index 762d9eb..891127c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -41,6 +41,7 @@
<task id="TkDealAlarmStatusV202404" name="鎺у埗鍣ㄦ姤璀︿笌鐘舵��" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatusV202404" />
<task id="TkDealWorkingReportV202404" name="鎺у埗鍣ㄥ伐浣滄姤(鍔熻兘鐮�80)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealWorkingReportV202404" />
<task id="TkDealTimingReportV202404" name="鎺у埗鍣ㄥ畾鏃朵笂鎶�(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealTimingReportV202404" />
+ <task id="TkDealOpenValveReportV202404" name="鎺у埗鍣ㄥ紑闃�涓婃姤(鍔熻兘鐮�84)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealOpenValveReportV202404" />
</task>
<!-- 璇嗗埆鍛戒护鍝嶅簲鏁版嵁 -->
<task id="TkFindComResponseV202404" name="璇嗗埆鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponseV202404">
--
Gitblit v1.8.0