From 3511619ad42e1706b1e798bf846426f1083bc63d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 15:44:32 +0800
Subject: [PATCH] 靳总协议与王工协议开关阀报数据库层面统一在一起。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java | 4
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 102 ++++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java | 16
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveHistoryMapper.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java | 28
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java | 153 ++++++-
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 45 --
/dev/null | 383 -------------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 127 +++++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 272 +++++++++----
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java | 16
13 files changed, 547 insertions(+), 610 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
index db78c79..a515e88 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
@@ -106,7 +106,7 @@
cdData.orderNo = ByteUtil.BCD2String_BE(bs, index, index + 7) ;
index += 8 ;
- cdData.opDt = GlParse.parseRtuDt(bs, index) ;
+ cdData.openDt = GlParse.parseRtuDt(bs, index) ;
index += 6 ;
cdData.waterTotalAmount = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
index 86bc1a7..d1b8e04 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
@@ -8,10 +8,10 @@
public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+ public String openDt;//寮�娉�/闃�鏃堕棿(yyyy-mm-dd HH:MM:SS)
public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- public String opDt ;//寮�娉�/闃�鏃堕棿(yyyy-mm-dd HH:MM:SS)
public Double waterTotalAmount ;//姘磋〃绱姘撮噺锛屽崟浣�0.01绔嬫柟绫�
public Double eleTotalAmount ;//鐢佃〃绱鐢甸噺锛屽崟浣�0.01搴�
public Double moneyRemainUser ;//鐢ㄦ埛鍓╀綑閲戦锛� 鍗曚綅0.01鍏�
@@ -42,7 +42,7 @@
sb.append(orderNo == null?"鏈煡":orderNo) ;
sb.append("\n") ;
sb.append(" 寮�娉�/闃�鏃堕棿 : ") ;
- sb.append(opDt == null?"鏈煡":opDt) ;
+ sb.append(openDt == null?"鏈煡": openDt) ;
sb.append("\n") ;
sb.append(" 姘磋〃绱姘撮噺 : ") ;
sb.append(waterTotalAmount == null?"鏈煡":waterTotalAmount) ;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseHistoryMapper.java
deleted file mode 100644
index 39c2f2d..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseHistoryMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dy.pipIrrGlobal.daoRm;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-06-20 10:34
- * @LastEditTime 2024-06-20 10:34
- * @Description
- */
-
-@Mapper
-public interface RmOpenCloseHistoryMapper extends BaseMapper<RmOpenCloseHistory> {
- int deleteByPrimaryKey(Long id);
-
- int insert(RmOpenCloseHistory record);
-
- int insertSelective(RmOpenCloseHistory record);
-
- RmOpenCloseHistory selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(RmOpenCloseHistory record);
-
- int updateByPrimaryKey(RmOpenCloseHistory record);
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseLastMapper.java
deleted file mode 100644
index c94b41e..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseLastMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dy.pipIrrGlobal.daoRm;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-06-20 10:34
- * @LastEditTime 2024-06-20 10:34
- * @Description
- */
-
-@Mapper
-public interface RmOpenCloseLastMapper extends BaseMapper<RmOpenCloseLast> {
- int deleteByPrimaryKey(Long id);
-
- int insert(RmOpenCloseLast record);
-
- int insertSelective(RmOpenCloseLast record);
-
- RmOpenCloseLast selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(RmOpenCloseLast record);
-
- int updateByPrimaryKey(RmOpenCloseLast record);
-
- /**
- * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇寮�鍏抽榾涓婃姤鏈�鏂版暟鎹�
- * @param rtuAddr
- * @return
- */
- List<RmOpenCloseLast> getRmOpenCloseReportLast(String rtuAddr);
-}
\ No newline at end of file
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..b59ab04 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
@@ -4,9 +4,8 @@
import org.apache.ibatis.annotations.Mapper;
/**
- * @Author liurunyu
- * @Date 2024/2/23 15:42
- * @LastEditTime 2024/2/23 15:42
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:28
* @Description
*/
@Mapper
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..bc9d4eb 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
@@ -6,15 +6,15 @@
import java.util.List;
/**
- * @Author liurunyu
- * @Date 2024/2/23 16:00
- * @LastEditTime 2024/2/23 16:00
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:29
* @Description
- */
+ */
@Mapper
public interface RmOpenCloseValveLastMapper {
/**
* delete by primary key
+ *
* @param id primaryKey
* @return deleteCount
*/
@@ -22,6 +22,7 @@
/**
* insert record to table
+ *
* @param record the record
* @return insert count
*/
@@ -29,6 +30,7 @@
/**
* insert record to table selective
+ *
* @param record the record
* @return insert count
*/
@@ -36,20 +38,15 @@
/**
* select by primary key
+ *
* @param id primary key
* @return object by primary key
*/
RmOpenCloseValveLast selectByPrimaryKey(Long id);
/**
- * 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
*/
@@ -57,8 +54,17 @@
/**
* update record
+ *
* @param record the updated record
* @return update count
*/
int updateByPrimaryKey(RmOpenCloseValveLast record);
+
+ /**
+ * select by rtuAddr
+ *
+ * @param rtuAddr rtuAddr
+ * @return object by rtuAddr
+ */
+ 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/RmOpenCloseHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseHistory.java
deleted file mode 100644
index 060b01f..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseHistory.java
+++ /dev/null
@@ -1,217 +0,0 @@
-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.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.po.BaseEntity;
-import com.dy.common.util.DateTime;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.Date;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-06-20 10:34
- * @LastEditTime 2024-06-20 10:34
- * @Description
- */
-/**
- * 寮�鍏抽榾鎶ュ巻鍙叉暟鎹〃
- */
-
-@TableName(value="rm_open_close_history", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "寮�鍏抽榾鎶ュ巻鍙叉暟鎹〃")
-public class RmOpenCloseHistory implements BaseEntity {
- public static final long serialVersionUID = 202406201040001L;
-
- /**
- * 涓婚敭
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
- /**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerId;
-
- /**
- * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeId;
-
- /**
- * 鎺у埗鍣ㄥ湴鍧�
- */
- public String rtuAddr;
-
- /**
- * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opDt;
-
- /**
- * 寮�闃�鎺у埗鍣ㄦ椂閽�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opRtuDt;
-
- /**
- * IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
- */
- public String opIcCardAddr;
-
- /**
- * IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
- */
- public String opIcCardNo;
-
- /**
- * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- */
- public String opOrderNo;
-
- /**
- * 寮�娉�/闃�鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date openDt;
-
- /**
- * 寮�闃�姘磋〃绱姘撮噺
- */
- public Double opWaterTotalAmount;
-
- /**
- * 寮�闃�鐢佃〃绱鐢甸噺
- */
- public Double opEleTotalAmount;
-
- /**
- * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
- */
- public Double opMoneyRemainUser;
-
- /**
- * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
- */
- public Double opWaterRemainUser;
-
- /**
- * 鍏虫车/闃�鏂瑰紡
- */
- public Byte opType;
-
- /**
- * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
- */
- public String clIcCardAddr;
-
- /**
- * 鍏抽榾IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
- */
- public String clIcCardNo;
-
- /**
- * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- */
- public String clOrderNo;
-
- /**
- * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date startDt;
-
- /**
- * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date endDt;
-
- /**
- * 姘磋〃绱娴侀噺
- */
- public Double clWaterTotalAmount;
-
- /**
- * 鐢佃〃绱鐢甸噺
- */
- public Double clEleTotalAmount;
-
- /**
- * 鐢ㄦ埛鍓╀綑閲戦
- */
- public Double clMoneyRemainUser;
-
- /**
- * 鐢ㄦ埛鍓╀綑姘撮噺
- */
- public Double clWaterRemainUser;
-
- /**
- * 鏈浣跨敤鐢甸噺
- */
- public Double thisEle;
-
- /**
- * 鏈浣跨敤姘撮噺
- */
- public Double thisWater;
-
- /**
- * 鏈浣跨敤閲戦
- */
- public Double thisMoney;
-
- /**
- * 鏈浣跨敤鏃堕棿闀�
- */
- public 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.opRtuDt = 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/RmOpenCloseLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseLast.java
deleted file mode 100644
index 5c8723d..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseLast.java
+++ /dev/null
@@ -1,217 +0,0 @@
-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.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.po.BaseEntity;
-import com.dy.common.util.DateTime;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.Date;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-06-20 10:34
- * @LastEditTime 2024-06-20 10:34
- * @Description
- */
-/**
- * 寮�鍏抽榾鎶ユ渶鏂版暟鎹〃
- */
-
-@TableName(value="rm_open_close_last", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "寮�鍏抽榾鎶ユ渶鏂版暟鎹〃")
-public class RmOpenCloseLast implements BaseEntity {
- public static final long serialVersionUID = 202406201041001L;
-
- /**
- * 涓婚敭
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
- /**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerId;
-
- /**
- * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long intakeId;
-
- /**
- * 鎺у埗鍣ㄥ湴鍧�
- */
- public String rtuAddr;
-
- /**
- * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opDt;
-
- /**
- * 寮�闃�鎺у埗鍣ㄦ椂閽�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date opRtuDt;
-
- /**
- * IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
- */
- public String opIcCardAddr;
-
- /**
- * IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
- */
- public String opIcCardNo;
-
- /**
- * 寮�闃�璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- */
- public String opOrderNo;
-
- /**
- * 寮�娉�/闃�鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date openDt;
-
- /**
- * 寮�闃�姘磋〃绱姘撮噺
- */
- public Double opWaterTotalAmount;
-
- /**
- * 寮�闃�鐢佃〃绱鐢甸噺
- */
- public Double opEleTotalAmount;
-
- /**
- * 寮�闃�鐢ㄦ埛鍓╀綑閲戦
- */
- public Double opMoneyRemainUser;
-
- /**
- * 寮�闃�鐢ㄦ埛鍓╀綑姘撮噺
- */
- public Double opWaterRemainUser;
-
- /**
- * 鍏虫车/闃�鏂瑰紡
- */
- public Byte opType;
-
- /**
- * 鍏抽榾IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
- */
- public String clIcCardAddr;
-
- /**
- * 鍏抽榾IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
- */
- public String clIcCardNo;
-
- /**
- * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- */
- public String clOrderNo;
-
- /**
- * 寮�濮嬫椂闂�(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date startDt;
-
- /**
- * 缁撴潫鏃堕棿(鍒嗘椂鏃ユ湀)
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date endDt;
-
- /**
- * 姘磋〃绱娴侀噺
- */
- public Double clWaterTotalAmount;
-
- /**
- * 鐢佃〃绱鐢甸噺
- */
- public Double clEleTotalAmount;
-
- /**
- * 鐢ㄦ埛鍓╀綑閲戦
- */
- public Double clMoneyRemainUser;
-
- /**
- * 鐢ㄦ埛鍓╀綑姘撮噺
- */
- public Double clWaterRemainUser;
-
- /**
- * 鏈浣跨敤鐢甸噺
- */
- public Double thisEle;
-
- /**
- * 鏈浣跨敤姘撮噺
- */
- public Double thisWater;
-
- /**
- * 鏈浣跨敤閲戦
- */
- public Double thisMoney;
-
- /**
- * 鏈浣跨敤鏃堕棿闀�
- */
- public 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.opRtuDt = 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/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index 433f9cc..c86489c 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
@@ -1,19 +1,29 @@
package com.dy.pipIrrGlobal.pojoRm;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
+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 java.util.Date;
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.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.po.BaseEntity;
-import com.dy.common.util.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.Date;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:28
+ * @Description
+ */
/**
* @Author liurunyu
@@ -39,175 +49,267 @@
@TableId(type = IdType.INPUT)
public Long id;
/**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
+ * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+ */
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long controllerId;
/**
- * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
- */
+ * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
+ */
@Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long intakeId;
/**
- * 鎺у埗鍣ㄥ湴鍧�
- */
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
@Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
public String rtuAddr;
/**
- * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
- @Schema(description = "鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
+ @Schema(description = "寮�闃�鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date opDt;
/**
- * 寮�闃�绫诲瀷
- */
+ * 寮�闃�绫诲瀷
+ */
@Schema(description = "寮�闃�绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte opType;
/**
- * 寮�闃�鏃剁疮璁℃祦閲�
- */
+ * 寮�闃�鏃剁疮璁℃祦閲�
+ */
@Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double opTotalAmount;
/**
- * 寮�闃�IC鍗＄紪鍙�
- */
+ * 寮�闃�IC鍗＄紪鍙�
+ */
@Schema(description = "寮�闃�IC鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String opIcCardNo;
/**
- * 寮�闃�ic鍗″湴鍧�
- */
+ * 寮�闃�ic鍗″湴鍧�
+ */
@Schema(description = "寮�闃�ic鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String opIcCardAddr;
/**
- * 寮�闃�鏃跺墿浣欓噾棰�
- */
+ * 寮�闃�鏃跺墿浣欓噾棰�
+ */
@Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double opRemainMoney;
/**
- * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
- */
+ * 寮�闃�璁㈠崟鍙�
+ */
+ @Schema(description = "寮�闃�璁㈠崟鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String opOrderNo;
+
+ /**
+ * 寮�闃�鏃剁數琛ㄧ疮璁＄數閲�
+ */
+ @Schema(description = "寮�闃�鏃剁數琛ㄧ疮璁＄數閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double opEleTotalAmount;
+
+ /**
+ * 寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺
+ */
+ @Schema(description = "寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double opWaterRemainUser;
+
+ /**
+ * 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
+ */
@Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date openDt;
/**
- * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
- */
+ * 鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
@Schema(description = "鍏抽榾鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date clDt;
/**
- * 鍏抽榾绫诲瀷
- */
+ * 鍏抽榾绫诲瀷
+ */
@Schema(description = "鍏抽榾绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte clType;
/**
- * 鍏抽榾鏃剁疮璁℃祦閲�
- */
+ * 鍏抽榾鏃剁疮璁℃祦閲�
+ */
@Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clTotalAmount;
/**
- * 鍏抽榾鏃禝C鍗＄紪鍙�
- */
+ * 鍏抽榾鏃禝C鍗＄紪鍙�
+ */
@Schema(description = "鍏抽榾鏃禝C鍗＄紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String clIcCardNo;
/**
- * 鍏抽榾鏃禝C鍗″湴鍧�
- */
+ * 鍏抽榾鏃禝C鍗″湴鍧�
+ */
@Schema(description = "鍏抽榾鏃禝C鍗″湴鍧�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String clIcCardAddr;
/**
- * 鍏抽榾鏃跺墿浣欓噾棰�
- */
+ * 鍏抽榾鏃跺墿浣欓噾棰�
+ */
@Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clRemainMoney;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
- */
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
+ */
@Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clThisAmount;
/**
- * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
- */
+ * 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
+ */
@Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double clThisMoney;
/**
- * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
- */
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ */
@Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Integer clThisTime;
/**
- * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
- */
+ * 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
+ */
@Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date clOpenDt;
/**
- * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
- */
+ * 鍏抽榾鏃舵帶鍒跺櫒鏃堕挓
+ */
@Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date closeDt;
- public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
- this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
- this.opType = dataCd83OpenVo.type ;
- this.opTotalAmount = dataCd83OpenVo.totalAmount ;
- this.opIcCardNo = dataCd83OpenVo.icCardNo ;
- this.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- this.opRemainMoney = dataCd83OpenVo.remainMoney ;
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
- this.clDt = null ;
- this.clType = null ;
- this.clTotalAmount = null ;
- this.clIcCardNo = null ;
- this.clIcCardAddr = null ;
- this.clRemainMoney = null ;
- this.clThisAmount = null ;
- this.clThisMoney = null ;
- this.clThisTime = null ;
- this.clOpenDt = null ;
- this.closeDt = null ;
+ /**
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ public String clOrderNo;
+
+ /**
+ * 鐢佃〃绱鐢甸噺
+ */
+ public Double clEleTotalAmount;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ public Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ public Double thisEle;
+
+ public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.opType = dataCd83OpenVo.type;
+ this.opTotalAmount = dataCd83OpenVo.totalAmount;
+ this.opIcCardNo = dataCd83OpenVo.icCardNo;
+ this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
+ this.opRemainMoney = dataCd83OpenVo.remainMoney;
+ this.opOrderNo = null; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = null; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = null; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.thisEle = null;//姹熸捣鍗忚鐗规湁
}
- public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve)throws Exception {
- this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
- this.opType = dataCd83OpenVo.type ;
- this.opTotalAmount = dataCd83OpenVo.totalAmount ;
- this.opIcCardNo = dataCd83OpenVo.icCardNo ;
- this.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- this.opRemainMoney = dataCd83OpenVo.remainMoney ;
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
- if(clearCloseValve){
- this.clDt = null ;
- this.clType = null ;
- this.clTotalAmount = null ;
- this.clIcCardNo = null ;
- this.clIcCardAddr = null ;
- this.clRemainMoney = null ;
- this.clThisAmount = null ;
- this.clThisMoney = null ;
- this.clThisTime = null ;
- this.clOpenDt = null ;
- this.closeDt = null ;
+ public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.opType = null;
+ this.opTotalAmount = cdData.waterTotalAmount;
+ this.opIcCardNo = cdData.icCardNo;
+ this.opIcCardAddr = cdData.icCardAddr;
+ this.opRemainMoney = cdData.moneyRemainUser;
+ this.opOrderNo = cdData.orderNo; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = cdData.eleTotalAmount; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = cdData.waterRemainUser; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.thisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+
+ public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {
+ this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
+ this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);
+ this.opType = cdData.opType;
+ this.clIcCardAddr = cdData.icCardAddr;
+ this.clIcCardNo = cdData.icCardNo;
+ this.clTotalAmount = cdData.waterTotalAmount;
+ this.clRemainMoney = cdData.moneyRemain;
+ this.clThisAmount = cdData.thisWater;
+ this.clThisMoney = cdData.thisMoney;
+ this.clThisTime = cdData.thisDuration;
+ this.clOrderNo = cdData.orderNo;
+ this.clEleTotalAmount = cdData.eleTotalAmount;
+ this.clWaterRemainUser = cdData.waterRemain;
+ this.thisEle = cdData.thisEle;
+ }
+
+ public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.opType = dataCd83OpenVo.type;
+ this.opTotalAmount = dataCd83OpenVo.totalAmount;
+ this.opIcCardNo = dataCd83OpenVo.icCardNo;
+ this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
+ this.opRemainMoney = dataCd83OpenVo.remainMoney;
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
+ if (clearCloseValve) {
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
}
}
}
\ 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 91272a4..11fb1aa 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
@@ -7,6 +7,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
+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.po.BaseEntity;
import com.dy.common.util.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -16,9 +19,8 @@
import java.util.Date;
/**
- * @Author liurunyu
- * @Date 2024/2/23 16:00
- * @LastEditTime 2024/2/23 16:00
+ * @Author: liurunyu
+ * @Date: 2024/7/1 15:29
* @Description
*/
@TableName(value="rm_open_close_valve_last", autoResultMap = true)
@@ -105,6 +107,24 @@
public Double opRemainMoney;
/**
+ * 寮�闃�璁㈠崟鍙�
+ */
+ @Schema(description = "寮�闃�璁㈠崟鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String opOrderNo;
+
+ /**
+ * 寮�闃�鏃剁數琛ㄧ疮璁＄數閲�
+ */
+ @Schema(description = "寮�闃�鏃剁數琛ㄧ疮璁＄數閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double opEleTotalAmount;
+
+ /**
+ * 寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺
+ */
+ @Schema(description = "寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double opWaterRemainUser;
+
+ /**
* 寮�闃�鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "寮�闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -176,37 +196,111 @@
@Schema(description = "鍏抽榾鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Date closeDt;
- public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo)throws Exception {
- this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
- this.opType = dataCd83OpenVo.type ;
- this.opTotalAmount = dataCd83OpenVo.totalAmount ;
- this.opIcCardNo = dataCd83OpenVo.icCardNo ;
- this.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- this.opRemainMoney = dataCd83OpenVo.remainMoney ;
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
- this.clDt = null ;
- this.clType = null ;
- this.clTotalAmount = null ;
- this.clIcCardNo = null ;
- this.clIcCardAddr = null ;
- this.clRemainMoney = null ;
- this.clThisAmount = null ;
- this.clThisMoney = null ;
- this.clThisTime = null ;
- this.clOpenDt = null ;
- this.closeDt = null ;
+ /**
+ * 鍏抽榾璁㈠崟鍙凤紙16浣嶆暟瀛楋級
+ */
+ public String clOrderNo;
+
+ /**
+ * 鐢佃〃绱鐢甸噺
+ */
+ public Double clEleTotalAmount;
+
+ /**
+ * 鐢ㄦ埛鍓╀綑姘撮噺
+ */
+ public Double clWaterRemainUser;
+
+ /**
+ * 鏈浣跨敤鐢甸噺
+ */
+ public Double thisEle;
+
+ public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.opType = dataCd83OpenVo.type;
+ this.opTotalAmount = dataCd83OpenVo.totalAmount;
+ this.opIcCardNo = dataCd83OpenVo.icCardNo;
+ this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
+ this.opRemainMoney = dataCd83OpenVo.remainMoney;
+ this.opOrderNo = null; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = null; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = null; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.thisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+
+ public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {
+ this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);
+ this.opType = null;
+ this.opTotalAmount = cdData.waterTotalAmount;
+ this.opIcCardNo = cdData.icCardNo;
+ this.opIcCardAddr = cdData.icCardAddr;
+ this.opRemainMoney = cdData.moneyRemainUser;
+ this.opOrderNo = cdData.orderNo; //姹熸捣鍗忚鐗规湁
+ this.opEleTotalAmount = cdData.eleTotalAmount; //姹熸捣鍗忚鐗规湁
+ this.opWaterRemainUser = cdData.waterRemainUser; //姹熸捣鍗忚鐗规湁
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
+ this.clDt = null;
+ this.clType = null;
+ this.clTotalAmount = null;
+ this.clIcCardNo = null;
+ this.clIcCardAddr = null;
+ this.clRemainMoney = null;
+ this.clThisAmount = null;
+ this.clThisMoney = null;
+ this.clThisTime = null;
+ this.clOpenDt = null;
+ this.closeDt = null;
+
+ this.clOrderNo = null;//姹熸捣鍗忚鐗规湁
+ this.clEleTotalAmount = null;//姹熸捣鍗忚鐗规湁
+ this.clWaterRemainUser = null;//姹熸捣鍗忚鐗规湁
+ this.thisEle = null;//姹熸捣鍗忚鐗规湁
+ }
+
+ public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {
+ this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
+ this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);
+ this.opType = cdData.opType;
+ this.clIcCardAddr = cdData.icCardAddr;
+ this.clIcCardNo = cdData.icCardNo;
+ this.clTotalAmount = cdData.waterTotalAmount;
+ this.clRemainMoney = cdData.moneyRemain;
+ this.clThisAmount = cdData.thisWater;
+ this.clThisMoney = cdData.thisMoney;
+ this.clThisTime = cdData.thisDuration;
+ this.clOrderNo = cdData.orderNo;
+ this.clEleTotalAmount = cdData.eleTotalAmount;
+ this.clWaterRemainUser = cdData.waterRemain;
+ this.thisEle = cdData.thisEle;
}
public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
- this.opType = dataCd83OpenVo.type ;
- this.opTotalAmount = dataCd83OpenVo.totalAmount ;
- this.opIcCardNo = dataCd83OpenVo.icCardNo ;
- this.opIcCardAddr = dataCd83OpenVo.icCardAddr ;
- this.opRemainMoney = dataCd83OpenVo.remainMoney ;
- this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;
+ this.opType = dataCd83OpenVo.type;
+ this.opTotalAmount = dataCd83OpenVo.totalAmount;
+ this.opIcCardNo = dataCd83OpenVo.icCardNo;
+ this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
+ this.opRemainMoney = dataCd83OpenVo.remainMoney;
+ this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
- if(clearCloseValve) {
+ if (clearCloseValve) {
this.clDt = null;
this.clType = null;
this.clTotalAmount = null;
@@ -220,5 +314,4 @@
this.closeDt = null;
}
}
-
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseHistoryMapper.xml
deleted file mode 100644
index 9b3896d..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseHistoryMapper.xml
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmOpenCloseHistoryMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory">
- <!--@mbg.generated-->
- <!--@Table rm_open_close_history-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <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_rtu_dt" jdbcType="TIMESTAMP" property="opRtuDt" />
- <result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
- <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="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="TINYINT" property="opType" />
- <result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
- <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_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-->
- select
- <include refid="Base_Column_List" />
- from rm_open_close_history
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from rm_open_close_history
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory">
- <!--@mbg.generated-->
- insert into rm_open_close_history (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=TINYINT},
- #{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.RmOpenCloseHistory">
- <!--@mbg.generated-->
- insert into rm_open_close_history
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="controllerId != null">
- controller_id,
- </if>
- <if test="intakeId != null">
- intake_id,
- </if>
- <if test="rtuAddr != null">
- rtu_addr,
- </if>
- <if test="opDt != null">
- op_dt,
- </if>
- <if test="opRtuDt != null">
- op_rtu_dt,
- </if>
- <if test="opIcCardAddr != null">
- op_ic_card_addr,
- </if>
- <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="opWaterTotalAmount != null">
- op_water_total_amount,
- </if>
- <if test="opEleTotalAmount != null">
- op_ele_total_amount,
- </if>
- <if test="opMoneyRemainUser != null">
- op_money_remain_user,
- </if>
- <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="clIcCardNo != null">
- cl_ic_card_no,
- </if>
- <if test="clOrderNo != null">
- cl_order_no,
- </if>
- <if test="startDt != null">
- start_dt,
- </if>
- <if test="endDt != null">
- end_dt,
- </if>
- <if test="clWaterTotalAmount != null">
- cl_water_total_amount,
- </if>
- <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="controllerId != null">
- #{controllerId,jdbcType=BIGINT},
- </if>
- <if test="intakeId != null">
- #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- #{opDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opRtuDt != null">
- #{opRtuDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opIcCardAddr != null">
- #{opIcCardAddr,jdbcType=VARCHAR},
- </if>
- <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="opWaterTotalAmount != null">
- #{opWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opEleTotalAmount != null">
- #{opEleTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opMoneyRemainUser != null">
- #{opMoneyRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opWaterRemainUser != null">
- #{opWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opType != null">
- #{opType,jdbcType=TINYINT},
- </if>
- <if test="clIcCardAddr != null">
- #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardNo != null">
- #{clIcCardNo,jdbcType=VARCHAR},
- </if>
- <if test="clOrderNo != null">
- #{clOrderNo,jdbcType=VARCHAR},
- </if>
- <if test="startDt != null">
- #{startDt,jdbcType=TIMESTAMP},
- </if>
- <if test="endDt != null">
- #{endDt,jdbcType=TIMESTAMP},
- </if>
- <if test="clWaterTotalAmount != null">
- #{clWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <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>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory">
- <!--@mbg.generated-->
- update rm_open_close_history
- <set>
- <if test="controllerId != null">
- controller_id = #{controllerId,jdbcType=BIGINT},
- </if>
- <if test="intakeId != null">
- intake_id = #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- </if>
- <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="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="opWaterTotalAmount != null">
- op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opEleTotalAmount != null">
- op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opMoneyRemainUser != null">
- op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opWaterRemainUser != null">
- op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=TINYINT},
- </if>
- <if test="clIcCardAddr != null">
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardNo != null">
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
- </if>
- <if test="clOrderNo != null">
- cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
- </if>
- <if test="startDt != null">
- start_dt = #{startDt,jdbcType=TIMESTAMP},
- </if>
- <if test="endDt != null">
- end_dt = #{endDt,jdbcType=TIMESTAMP},
- </if>
- <if test="clWaterTotalAmount != null">
- cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <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}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory">
- <!--@mbg.generated-->
- update rm_open_close_history
- set controller_id = #{controllerId,jdbcType=BIGINT},
- intake_id = #{intakeId,jdbcType=BIGINT},
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
- op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
- op_order_no = #{opOrderNo,jdbcType=VARCHAR},
- open_dt = #{openDt,jdbcType=TIMESTAMP},
- 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=TINYINT},
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- 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/RmOpenCloseLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseLastMapper.xml
deleted file mode 100644
index da66783..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseLastMapper.xml
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmOpenCloseLastMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast">
- <!--@mbg.generated-->
- <!--@Table rm_open_close_last-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <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_rtu_dt" jdbcType="TIMESTAMP" property="opRtuDt" />
- <result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
- <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="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="TINYINT" property="opType" />
- <result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
- <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_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-->
- select
- <include refid="Base_Column_List" />
- from rm_open_close_last
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from rm_open_close_last
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast">
- <!--@mbg.generated-->
- insert into rm_open_close_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=TINYINT},
- #{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.RmOpenCloseLast">
- <!--@mbg.generated-->
- insert into rm_open_close_last
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="controllerId != null">
- controller_id,
- </if>
- <if test="intakeId != null">
- intake_id,
- </if>
- <if test="rtuAddr != null">
- rtu_addr,
- </if>
- <if test="opDt != null">
- op_dt,
- </if>
- <if test="opRtuDt != null">
- op_rtu_dt,
- </if>
- <if test="opIcCardAddr != null">
- op_ic_card_addr,
- </if>
- <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="opWaterTotalAmount != null">
- op_water_total_amount,
- </if>
- <if test="opEleTotalAmount != null">
- op_ele_total_amount,
- </if>
- <if test="opMoneyRemainUser != null">
- op_money_remain_user,
- </if>
- <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="clIcCardNo != null">
- cl_ic_card_no,
- </if>
- <if test="clOrderNo != null">
- cl_order_no,
- </if>
- <if test="startDt != null">
- start_dt,
- </if>
- <if test="endDt != null">
- end_dt,
- </if>
- <if test="clWaterTotalAmount != null">
- cl_water_total_amount,
- </if>
- <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="controllerId != null">
- #{controllerId,jdbcType=BIGINT},
- </if>
- <if test="intakeId != null">
- #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- #{opDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opRtuDt != null">
- #{opRtuDt,jdbcType=TIMESTAMP},
- </if>
- <if test="opIcCardAddr != null">
- #{opIcCardAddr,jdbcType=VARCHAR},
- </if>
- <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="opWaterTotalAmount != null">
- #{opWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opEleTotalAmount != null">
- #{opEleTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opMoneyRemainUser != null">
- #{opMoneyRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opWaterRemainUser != null">
- #{opWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opType != null">
- #{opType,jdbcType=TINYINT},
- </if>
- <if test="clIcCardAddr != null">
- #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardNo != null">
- #{clIcCardNo,jdbcType=VARCHAR},
- </if>
- <if test="clOrderNo != null">
- #{clOrderNo,jdbcType=VARCHAR},
- </if>
- <if test="startDt != null">
- #{startDt,jdbcType=TIMESTAMP},
- </if>
- <if test="endDt != null">
- #{endDt,jdbcType=TIMESTAMP},
- </if>
- <if test="clWaterTotalAmount != null">
- #{clWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <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>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast">
- <!--@mbg.generated-->
- update rm_open_close_last
- <set>
- <if test="controllerId != null">
- controller_id = #{controllerId,jdbcType=BIGINT},
- </if>
- <if test="intakeId != null">
- intake_id = #{intakeId,jdbcType=BIGINT},
- </if>
- <if test="rtuAddr != null">
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
- </if>
- <if test="opDt != null">
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- </if>
- <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="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="opWaterTotalAmount != null">
- op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opEleTotalAmount != null">
- op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
- </if>
- <if test="opMoneyRemainUser != null">
- op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opWaterRemainUser != null">
- op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
- </if>
- <if test="opType != null">
- op_type = #{opType,jdbcType=TINYINT},
- </if>
- <if test="clIcCardAddr != null">
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- </if>
- <if test="clIcCardNo != null">
- cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
- </if>
- <if test="clOrderNo != null">
- cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
- </if>
- <if test="startDt != null">
- start_dt = #{startDt,jdbcType=TIMESTAMP},
- </if>
- <if test="endDt != null">
- end_dt = #{endDt,jdbcType=TIMESTAMP},
- </if>
- <if test="clWaterTotalAmount != null">
- cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
- </if>
- <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}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast">
- <!--@mbg.generated-->
- update rm_open_close_last
- set controller_id = #{controllerId,jdbcType=BIGINT},
- intake_id = #{intakeId,jdbcType=BIGINT},
- rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
- op_dt = #{opDt,jdbcType=TIMESTAMP},
- op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
- op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
- op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
- op_order_no = #{opOrderNo,jdbcType=VARCHAR},
- open_dt = #{openDt,jdbcType=TIMESTAMP},
- 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=TINYINT},
- cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
- 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>
-
- <!--鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇寮�鍏抽榾涓婃姤鏈�鏂版暟鎹�-->
- <select id="getRmOpenCloseReportLast" resultType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast">
- select
- <include refid="Base_Column_List" />
- from rm_open_close_last
- where rtu_addr = #{rtuAddr}
- </select>
-</mapper>
\ 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..bfdbb78 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -15,6 +15,9 @@
<result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
<result column="op_remain_money" jdbcType="DOUBLE" property="opRemainMoney" />
<result column="open_dt" jdbcType="TIMESTAMP" property="openDt" />
+ <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
+ <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
+ <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
<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" />
@@ -26,13 +29,18 @@
<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_order_no" jdbcType="VARCHAR" property="clOrderNo" />
+ <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
+ <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
+ <result column="cl_this_ele" jdbcType="FLOAT" property="clThisEle" />
</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
+ op_ic_card_addr, op_remain_money, open_dt, op_order_no, op_ele_total_amount, op_water_remain_user,
+ 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, cl_order_no, cl_ele_total_amount,
+ cl_water_remain_user, cl_this_ele
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -51,19 +59,23 @@
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,
+ op_remain_money, open_dt, op_order_no,
+ op_ele_total_amount, op_water_remain_user, 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)
+ close_dt, cl_order_no, cl_ele_total_amount,
+ cl_water_remain_user, cl_this_ele)
values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
- #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, #{opType,jdbcType=TINYINT},
+ #{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},
+ #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP}, #{opOrderNo,jdbcType=VARCHAR},
+ #{opEleTotalAmount,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{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})
+ #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER}, #{clOpenDt,jdbcType=TIMESTAMP},
+ #{closeDt,jdbcType=TIMESTAMP}, #{clOrderNo,jdbcType=VARCHAR}, #{clEleTotalAmount,jdbcType=FLOAT},
+ #{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory">
<!--@mbg.generated-->
@@ -102,6 +114,15 @@
<if test="openDt != null">
open_dt,
</if>
+ <if test="opOrderNo != null">
+ op_order_no,
+ </if>
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount,
+ </if>
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user,
+ </if>
<if test="clDt != null">
cl_dt,
</if>
@@ -134,6 +155,18 @@
</if>
<if test="closeDt != null">
close_dt,
+ </if>
+ <if test="clOrderNo != null">
+ cl_order_no,
+ </if>
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount,
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user,
+ </if>
+ <if test="clThisEle != null">
+ cl_this_ele,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -170,6 +203,15 @@
<if test="openDt != null">
#{openDt,jdbcType=TIMESTAMP},
</if>
+ <if test="opOrderNo != null">
+ #{opOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opEleTotalAmount != null">
+ #{opEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="opWaterRemainUser != null">
+ #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
<if test="clDt != null">
#{clDt,jdbcType=TIMESTAMP},
</if>
@@ -202,6 +244,18 @@
</if>
<if test="closeDt != null">
#{closeDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="clOrderNo != null">
+ #{clOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clEleTotalAmount != null">
+ #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clThisEle != null">
+ #{clThisEle,jdbcType=FLOAT},
</if>
</trim>
</insert>
@@ -239,6 +293,15 @@
<if test="openDt != null">
open_dt = #{openDt,jdbcType=TIMESTAMP},
</if>
+ <if test="opOrderNo != null">
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
<if test="clDt != null">
cl_dt = #{clDt,jdbcType=TIMESTAMP},
</if>
@@ -272,6 +335,18 @@
<if test="closeDt != null">
close_dt = #{closeDt,jdbcType=TIMESTAMP},
</if>
+ <if test="clOrderNo != null">
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clThisEle != null">
+ cl_this_ele = #{clThisEle,jdbcType=FLOAT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -288,6 +363,9 @@
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
open_dt = #{openDt,jdbcType=TIMESTAMP},
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
cl_dt = #{clDt,jdbcType=TIMESTAMP},
cl_type = #{clType,jdbcType=TINYINT},
cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
@@ -298,7 +376,11 @@
cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
cl_this_time = #{clThisTime,jdbcType=INTEGER},
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- close_dt = #{closeDt,jdbcType=TIMESTAMP}
+ close_dt = #{closeDt,jdbcType=TIMESTAMP},
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ cl_this_ele = #{clThisEle,jdbcType=FLOAT}
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..226ff6b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -16,6 +16,9 @@
<result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
<result column="op_remain_money" jdbcType="DOUBLE" property="opRemainMoney" />
<result column="open_dt" jdbcType="TIMESTAMP" property="openDt" />
+ <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
+ <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
+ <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
<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" />
@@ -27,13 +30,18 @@
<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_order_no" jdbcType="VARCHAR" property="clOrderNo" />
+ <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
+ <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
+ <result column="cl_this_ele" jdbcType="FLOAT" property="clThisEle" />
</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, 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, op_order_no, op_ele_total_amount,
+ op_water_remain_user, 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,
+ cl_order_no, cl_ele_total_amount, cl_water_remain_user, cl_this_ele
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -42,7 +50,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
@@ -57,22 +64,28 @@
</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, 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,
+ op_order_no, op_ele_total_amount, op_water_remain_user,
+ 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, cl_order_no,
+ cl_ele_total_amount, cl_water_remain_user, cl_this_ele
+ )
+ 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},
+ #{opOrderNo,jdbcType=VARCHAR}, #{opEleTotalAmount,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT},
+ #{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}, #{clOrderNo,jdbcType=VARCHAR},
+ #{clEleTotalAmount,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT}, #{clThisEle,jdbcType=FLOAT}
+ )
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
<!--@mbg.generated-->
@@ -114,6 +127,15 @@
<if test="openDt != null">
open_dt,
</if>
+ <if test="opOrderNo != null">
+ op_order_no,
+ </if>
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount,
+ </if>
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user,
+ </if>
<if test="clDt != null">
cl_dt,
</if>
@@ -146,6 +168,18 @@
</if>
<if test="closeDt != null">
close_dt,
+ </if>
+ <if test="clOrderNo != null">
+ cl_order_no,
+ </if>
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount,
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user,
+ </if>
+ <if test="clThisEle != null">
+ cl_this_ele,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -185,6 +219,15 @@
<if test="openDt != null">
#{openDt,jdbcType=TIMESTAMP},
</if>
+ <if test="opOrderNo != null">
+ #{opOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opEleTotalAmount != null">
+ #{opEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="opWaterRemainUser != null">
+ #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
<if test="clDt != null">
#{clDt,jdbcType=TIMESTAMP},
</if>
@@ -217,6 +260,18 @@
</if>
<if test="closeDt != null">
#{closeDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="clOrderNo != null">
+ #{clOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clEleTotalAmount != null">
+ #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clThisEle != null">
+ #{clThisEle,jdbcType=FLOAT},
</if>
</trim>
</insert>
@@ -257,6 +312,15 @@
<if test="openDt != null">
open_dt = #{openDt,jdbcType=TIMESTAMP},
</if>
+ <if test="opOrderNo != null">
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="opEleTotalAmount != null">
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="opWaterRemainUser != null">
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+ </if>
<if test="clDt != null">
cl_dt = #{clDt,jdbcType=TIMESTAMP},
</if>
@@ -290,6 +354,18 @@
<if test="closeDt != null">
close_dt = #{closeDt,jdbcType=TIMESTAMP},
</if>
+ <if test="clOrderNo != null">
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="clEleTotalAmount != null">
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ </if>
+ <if test="clWaterRemainUser != null">
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ </if>
+ <if test="clThisEle != null">
+ cl_this_ele = #{clThisEle,jdbcType=FLOAT},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -307,6 +383,9 @@
op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
open_dt = #{openDt,jdbcType=TIMESTAMP},
+ op_order_no = #{opOrderNo,jdbcType=VARCHAR},
+ op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+ op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
cl_dt = #{clDt,jdbcType=TIMESTAMP},
cl_type = #{clType,jdbcType=TINYINT},
cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
@@ -317,7 +396,11 @@
cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
cl_this_time = #{clThisTime,jdbcType=INTEGER},
cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
- close_dt = #{closeDt,jdbcType=TIMESTAMP}
+ close_dt = #{closeDt,jdbcType=TIMESTAMP},
+ cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+ cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+ cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+ cl_this_ele = #{clThisEle,jdbcType=FLOAT}
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/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index 773046e..7241234 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -57,11 +57,6 @@
@Autowired
private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
- @Autowired
- private RmOpenCloseHistoryMapper rmOpenCloseHistoryDao;
- @Autowired
- private RmOpenCloseLastMapper rmOpenCloseLastDao;
-
//@Autowired
//@Lazy
//private DbSv sv ;
@@ -317,46 +312,6 @@
@Transactional(rollbackFor = Exception.class)
public void updateRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
- }
-
- /**
- * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmOpenCloseLast(RmOpenCloseLast po){
- this.rmOpenCloseLastDao.insert(po) ;
- }
-
- /**
- * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶璁板綍(202404)
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmOpenCloseHistory(RmOpenCloseHistory po){
- this.rmOpenCloseHistoryDao.insert(po) ;
- }
-
- /**
- * 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
- * @param rtuAddr
- * @return
- */
- public RmOpenCloseLast getRmOpenCloseLast(String rtuAddr){
- List<RmOpenCloseLast> list = rmOpenCloseLastDao.getRmOpenCloseReportLast(rtuAddr);
- if(list != null && list.size() > 0){
- return list.get(0) ;
- }
- return null ;
- }
-
- /**
- * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void updateRmOpenCloseLast(RmOpenCloseLast po){
- this.rmOpenCloseLastDao.updateByPrimaryKeySelective(po);
}
/////////////////////////////////////////////////
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
index f2fe40d..3686852 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
@@ -55,8 +55,8 @@
}else if(cdObj instanceof DataCd84Vo){
//璁惧缁堢鍒峰崱寮�娉�/闃�涓婃姤
DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.opDt, cdData, dV202404.dt) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), cdData.opDt, cdData, dV202404.dt) ;
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
}else if(cdObj instanceof DataCdC2Vo){
//璁惧缁堢寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤
DataCdC2Vo cdData = (DataCdC2Vo)(cdObj) ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
index 43f32fe..12a7da7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
@@ -4,8 +4,8 @@
import com.dy.common.mw.protocol.p206V202404.DataV202404;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd85Vo;
import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -69,19 +69,19 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData)throws Exception {
- RmOpenCloseLast po = sv.getRmOpenCloseLast(rtuAddr);
+ RmOpenCloseValveLast po = sv.getRmOpenCloseValveLast(rtuAddr);
if(po == null){
- po = new RmOpenCloseLast();
+ po = new RmOpenCloseValveLast();
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom85(dataV202404, cdData);
- sv.saveRmOpenCloseLast(po);
+ sv.saveRmOpenCloseValveLast(po);
}else{
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.valueFrom85(dataV202404, cdData);
- sv.updateRmOpenCloseLast(po);
+ sv.updateRmOpenCloseValveLast(po);
}
}
@@ -94,11 +94,11 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData)throws Exception {
- RmOpenCloseHistory po = new RmOpenCloseHistory();
+ RmOpenCloseValveHistory po = new RmOpenCloseValveHistory();
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom85(dataV202404, cdData);
- sv.saveRmOpenCloseHistory(po); ;
+ sv.saveRmOpenCloseValveHistory(po); ;
}
}
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
index 76f11b8..73305a7 100644
--- 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
@@ -4,8 +4,8 @@
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.pipIrrGlobal.pojoRm.RmOpenCloseHistory;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -69,19 +69,19 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
- RmOpenCloseLast po = sv.getRmOpenCloseLast(rtuAddr);
+ RmOpenCloseValveLast po = sv.getRmOpenCloseValveLast(rtuAddr);
if(po == null){
- po = new RmOpenCloseLast();
+ po = new RmOpenCloseValveLast();
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom84(dataV202404, cdData);
- sv.saveRmOpenCloseLast(po);
+ sv.saveRmOpenCloseValveLast(po);
}else{
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.valueFrom84(dataV202404, cdData);
- sv.updateRmOpenCloseLast(po);
+ sv.updateRmOpenCloseValveLast(po);
}
}
@@ -94,11 +94,11 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
- RmOpenCloseHistory po = new RmOpenCloseHistory();
+ RmOpenCloseValveHistory po = new RmOpenCloseValveHistory();
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom84(dataV202404, cdData);
- sv.saveRmOpenCloseHistory(po); ;
+ sv.saveRmOpenCloseValveHistory(po); ;
}
}
--
Gitblit v1.8.0