From 9610012b92a61893587439591a8577215f4c2cbd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 14 六月 2024 14:53:49 +0800
Subject: [PATCH] 2024-06-14 朱宝民 定时报
---
/dev/null | 206 -----------------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmTimingReportHistoryMapper.java | 27 ++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java | 85 +++---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java | 104 ++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java | 7
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportHistoryMapper.xml | 222 ++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmOpenCloseValveLastMapper.java | 1
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 44 ---
9 files changed, 401 insertions(+), 298 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java
index 53741ee..bb0bf4c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoRm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import org.apache.ibatis.annotations.Mapper;
@@ -9,7 +10,7 @@
* @Description
*/
@Mapper
-public interface RmAlarmStateHistoryMapper {
+public interface RmAlarmStateHistoryMapper extends BaseMapper<RmAlarmStateHistory> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportHistoryMapper.java
deleted file mode 100644
index 646b31c..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportHistoryMapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.dy.pipIrrGlobal.daoRm;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @Author liurunyu
- * @Date 2024/1/16 14:59
- * @LastEditTime 2024/1/16 14:59
- * @Description
- */
-@Mapper
-public interface RmAutoReportHistoryMapper extends BaseMapper<RmAutoReportHistory> {
- /**
- * delete by primary key
- * @param id primaryKey
- * @return deleteCount
- */
- int deleteByPrimaryKey(Long id);
-
- /**
- * insert record to table
- * @param record the record
- * @return insert count
- */
- int insert(RmAutoReportHistory record);
-
- /**
- * insert record to table selective
- * @param record the record
- * @return insert count
- */
- int insertSelective(RmAutoReportHistory record);
-
- /**
- * select by primary key
- * @param id primary key
- * @return object by primary key
- */
- RmAutoReportHistory selectByPrimaryKey(Long id);
-
- /**
- * update record selective
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKeySelective(RmAutoReportHistory record);
-
- /**
- * update record
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKey(RmAutoReportHistory record);
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportLastMapper.java
deleted file mode 100644
index 21214ec..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportLastMapper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.dy.pipIrrGlobal.daoRm;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @Author liurunyu
- * @Date 2024/1/16 14:45
- * @LastEditTime 2024/1/16 14:45
- * @Description
- */
-@Mapper
-public interface RmAutoReportLastMapper extends BaseMapper<RmAutoReportLast> {
- /**
- * delete by primary key
- * @param id primaryKey
- * @return deleteCount
- */
- int deleteByPrimaryKey(Long id);
-
- /**
- * insert record to table
- * @param record the record
- * @return insert count
- */
- int insert(RmAutoReportLast record);
-
- /**
- * insert record to table selective
- * @param record the record
- * @return insert count
- */
- int insertSelective(RmAutoReportLast record);
-
- /**
- * select by primary key
- * @param id primary key
- * @return object by primary key
- */
- RmAutoReportLast selectByPrimaryKey(Long id);
-
- /**
- * select by rtuAddr
- * @param rtuAddr rtuAddr
- * @return object by rtuAddr
- */
- List<RmAutoReportLast> selectByRtuAddr(String rtuAddr);
-
- /**
- * update record selective
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKeySelective(RmAutoReportLast record);
-
- /**
- * update record
- * @param record the updated record
- * @return update count
- */
- int updateByPrimaryKey(RmAutoReportLast 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 9fadae6..8dbadd4 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,6 +1,5 @@
package com.dy.pipIrrGlobal.daoRm;
-import com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import org.apache.ibatis.annotations.Mapper;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmTimingReportHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmTimingReportHistoryMapper.java
new file mode 100644
index 0000000..32f5cfc
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmTimingReportHistoryMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrGlobal.daoRm;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-06-14 14:43
+ * @LastEditTime 2024-06-14 14:43
+ * @Description
+ */
+
+@Mapper
+public interface RmTimingReportHistoryMapper extends BaseMapper<RmTimingReportHistory> {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(RmTimingReportHistory record);
+
+ int insertSelective(RmTimingReportHistory record);
+
+ RmTimingReportHistory selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(RmTimingReportHistory record);
+
+ int updateByPrimaryKey(RmTimingReportHistory record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportHistory.java
deleted file mode 100644
index 1ddc251..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportHistory.java
+++ /dev/null
@@ -1,116 +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.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.Date;
-
-/**
- * @Author liurunyu
- * @Date 2024/1/16 14:59
- * @LastEditTime 2024/1/16 14:59
- * @Description 缁堢鑷姤锛堟渶鏂帮級
- */
-@TableName(value="rm_alarm_state_history", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鎺у埗鍣ㄨ嚜鎶ワ紙鍘嗗彶锛�")
-public class RmAutoReportHistory implements BaseEntity {
-
- public static final long serialVersionUID = 202401161501001L;
- /**
- * 涓婚敭
- */
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
-
- /**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerid;
-
- /**
- * 鍙栨按鍙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)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date dt;
-
- /**
- * 鎺у埗鍣ㄦ椂閽�
- */
- @Schema(description = "鎺у埗鍣ㄦ椂閽�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date rtudt;
-
- /**
- * 鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h
- */
- @Schema(description = "鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double instantamount;
-
- /**
- * 绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3
- */
- @Schema(description = "绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double totalamount;
-
- /**
- * 鎹熷け娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3
- */
- @Schema(description = "鎹熷け娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double lossamount;
-
- /**
- * 姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa
- */
- @Schema(description = "姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double waterpress;
-
- /**
- * 钃勭數姹犵數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V
- */
- @Schema(description = "钃勭數姹犵數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double batteryvolt;
-
- /**
- * 澶槼鑳界數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V
- */
- @Schema(description = "澶槼鑳界數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double sunvolt;
-
- /**
- * 淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99
- */
- @Schema(description = "淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer signalvalue;
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportLast.java
deleted file mode 100644
index d3b1f04..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportLast.java
+++ /dev/null
@@ -1,116 +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.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.util.Date;
-
-/**
- * @Author liurunyu
- * @Date 2024/1/16 14:45
- * @LastEditTime 2024/1/16 14:45
- * @Description 缁堢鑷姤锛堟渶鏂帮級
- */
-@TableName(value="rm_alarm_state_last", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鎺у埗鍣ㄨ嚜鎶ワ紙鏈�鏂帮級")
-public class RmAutoReportLast implements BaseEntity {
-
- public static final long serialVersionUID = 202401161446001L;
- /**
- * 涓婚敭
- */
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
-
- /**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerid;
-
- /**
- * 鍙栨按鍙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)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date dt;
-
- /**
- * 鎺у埗鍣ㄦ椂閽�
- */
- @Schema(description = "鎺у埗鍣ㄦ椂閽�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date rtudt;
-
- /**
- * 鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h
- */
- @Schema(description = "鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double instantamount;
-
- /**
- * 绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3
- */
- @Schema(description = "绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double totalamount;
-
- /**
- * 鎹熷け娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3
- */
- @Schema(description = "鎹熷け娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double lossamount;
-
- /**
- * 姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa
- */
- @Schema(description = "姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double waterpress;
-
- /**
- * 钃勭數姹犵數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V
- */
- @Schema(description = "钃勭數姹犵數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double batteryvolt;
-
- /**
- * 澶槼鑳界數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V
- */
- @Schema(description = "澶槼鑳界數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double sunvolt;
-
- /**
- * 淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99
- */
- @Schema(description = "淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer signalvalue;
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
new file mode 100644
index 0000000..3c19a46
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
@@ -0,0 +1,104 @@
+package com.dy.pipIrrGlobal.pojoRm;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-06-14 14:43
+ * @LastEditTime 2024-06-14 14:43
+ * @Description
+ */
+/**
+ * 瀹氭椂鎶ュ巻鍙叉暟鎹〃
+ */
+
+@TableName(value="rm_timing_report_history", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "瀹氭椂鎶ュ巻鍙叉暟鎹〃")
+public class RmTimingReportHistory {
+ public static final long serialVersionUID = 202406111447001L;
+
+ /**
+ * 涓婚敭
+ */
+ private Long id;
+
+ /**
+ * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
+ */
+ private Long controllerId;
+
+ /**
+ * 鍙栨按鍙ｅ疄浣揑D锛堝閿級
+ */
+ private Long intakeId;
+
+ /**
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
+ private String rtuAddr;
+
+ /**
+ * 鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
+ */
+ private Date dt;
+
+ /**
+ * 鎺у埗鍣ㄦ椂閽�
+ */
+ private Date rtuDt;
+
+ /**
+ * 鏁版嵁鏃堕棿
+ */
+ private Date dataDt;
+
+ /**
+ * 鏈勾绱娴侀噺
+ */
+ private Double waterTotalAmountYear;
+
+ /**
+ * 姘磋〃绱娴侀噺
+ */
+ private Double waterTotalAmountMeter;
+
+ /**
+ * 鏈勾绱鐢甸噺
+ */
+ private Double eleTotalAmountYear;
+
+ /**
+ * 鐢佃〃绱鐢甸噺
+ */
+ private Double eleTotalAmountMeter;
+
+ /**
+ * 褰撴棩姘磋〃鍑�娴侀噺
+ */
+ private Double waterTotalAmountDay;
+
+ /**
+ * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
+ */
+ private Double waterUserTotalAmountDay;
+
+ /**
+ * 婕忔崯姘撮噺
+ */
+ private Double lossTotalAmountDay;
+
+ /**
+ * 鍚庡鐢垫睜鐢靛帇
+ */
+ private Double batteryVolt;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportHistoryMapper.xml
deleted file mode 100644
index 492796b..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportHistoryMapper.xml
+++ /dev/null
@@ -1,197 +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.RmAutoReportHistoryMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory">
- <!--@mbg.generated-->
- <!--@Table rm_auto_report_history-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="controllerId" jdbcType="BIGINT" property="controllerid" />
- <result column="intakeId" jdbcType="BIGINT" property="intakeid" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- <result column="rtuDt" jdbcType="TIMESTAMP" property="rtudt" />
- <result column="instantAmount" jdbcType="DOUBLE" property="instantamount" />
- <result column="totalAmount" jdbcType="DOUBLE" property="totalamount" />
- <result column="lossAmount" jdbcType="DOUBLE" property="lossamount" />
- <result column="waterPress" jdbcType="DOUBLE" property="waterpress" />
- <result column="batteryVolt" jdbcType="DOUBLE" property="batteryvolt" />
- <result column="sunVolt" jdbcType="DOUBLE" property="sunvolt" />
- <result column="signalValue" jdbcType="INTEGER" property="signalvalue" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, controllerId, intakeId, rtuAddr, dt, rtuDt, instantAmount, totalAmount, lossAmount,
- waterPress, batteryVolt, sunVolt, signalValue
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from rm_auto_report_history
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from rm_auto_report_history
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory">
- <!--@mbg.generated-->
- insert into rm_auto_report_history (id, controllerId, intakeId,
- rtuAddr, dt, rtuDt, instantAmount,
- totalAmount, lossAmount, waterPress,
- batteryVolt, sunVolt, signalValue
- )
- values (#{id,jdbcType=BIGINT}, #{controllerid,jdbcType=BIGINT}, #{intakeid,jdbcType=BIGINT},
- #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtudt,jdbcType=TIMESTAMP}, #{instantamount,jdbcType=DOUBLE},
- #{totalamount,jdbcType=DOUBLE}, #{lossamount,jdbcType=DOUBLE}, #{waterpress,jdbcType=DOUBLE},
- #{batteryvolt,jdbcType=DOUBLE}, #{sunvolt,jdbcType=DOUBLE}, #{signalvalue,jdbcType=INTEGER}
- )
- </insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory">
- <!--@mbg.generated-->
- insert into rm_auto_report_history
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="controllerid != null">
- controllerId,
- </if>
- <if test="intakeid != null">
- intakeId,
- </if>
- <if test="rtuaddr != null">
- rtuAddr,
- </if>
- <if test="dt != null">
- dt,
- </if>
- <if test="rtudt != null">
- rtuDt,
- </if>
- <if test="instantamount != null">
- instantAmount,
- </if>
- <if test="totalamount != null">
- totalAmount,
- </if>
- <if test="lossamount != null">
- lossAmount,
- </if>
- <if test="waterpress != null">
- waterPress,
- </if>
- <if test="batteryvolt != null">
- batteryVolt,
- </if>
- <if test="sunvolt != null">
- sunVolt,
- </if>
- <if test="signalvalue != null">
- signalValue,
- </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="dt != null">
- #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="rtudt != null">
- #{rtudt,jdbcType=TIMESTAMP},
- </if>
- <if test="instantamount != null">
- #{instantamount,jdbcType=DOUBLE},
- </if>
- <if test="totalamount != null">
- #{totalamount,jdbcType=DOUBLE},
- </if>
- <if test="lossamount != null">
- #{lossamount,jdbcType=DOUBLE},
- </if>
- <if test="waterpress != null">
- #{waterpress,jdbcType=DOUBLE},
- </if>
- <if test="batteryvolt != null">
- #{batteryvolt,jdbcType=DOUBLE},
- </if>
- <if test="sunvolt != null">
- #{sunvolt,jdbcType=DOUBLE},
- </if>
- <if test="signalvalue != null">
- #{signalvalue,jdbcType=INTEGER},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory">
- <!--@mbg.generated-->
- update rm_auto_report_history
- <set>
- <if test="controllerid != null">
- controllerId = #{controllerid,jdbcType=BIGINT},
- </if>
- <if test="intakeid != null">
- intakeId = #{intakeid,jdbcType=BIGINT},
- </if>
- <if test="rtuaddr != null">
- rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
- </if>
- <if test="dt != null">
- dt = #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="rtudt != null">
- rtuDt = #{rtudt,jdbcType=TIMESTAMP},
- </if>
- <if test="instantamount != null">
- instantAmount = #{instantamount,jdbcType=DOUBLE},
- </if>
- <if test="totalamount != null">
- totalAmount = #{totalamount,jdbcType=DOUBLE},
- </if>
- <if test="lossamount != null">
- lossAmount = #{lossamount,jdbcType=DOUBLE},
- </if>
- <if test="waterpress != null">
- waterPress = #{waterpress,jdbcType=DOUBLE},
- </if>
- <if test="batteryvolt != null">
- batteryVolt = #{batteryvolt,jdbcType=DOUBLE},
- </if>
- <if test="sunvolt != null">
- sunVolt = #{sunvolt,jdbcType=DOUBLE},
- </if>
- <if test="signalvalue != null">
- signalValue = #{signalvalue,jdbcType=INTEGER},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory">
- <!--@mbg.generated-->
- update rm_auto_report_history
- set controllerId = #{controllerid,jdbcType=BIGINT},
- intakeId = #{intakeid,jdbcType=BIGINT},
- rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
- dt = #{dt,jdbcType=TIMESTAMP},
- rtuDt = #{rtudt,jdbcType=TIMESTAMP},
- instantAmount = #{instantamount,jdbcType=DOUBLE},
- totalAmount = #{totalamount,jdbcType=DOUBLE},
- lossAmount = #{lossamount,jdbcType=DOUBLE},
- waterPress = #{waterpress,jdbcType=DOUBLE},
- batteryVolt = #{batteryvolt,jdbcType=DOUBLE},
- sunVolt = #{sunvolt,jdbcType=DOUBLE},
- signalValue = #{signalvalue,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/RmAutoReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml
deleted file mode 100644
index 2b2a419..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml
+++ /dev/null
@@ -1,206 +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.RmAutoReportLastMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast">
- <!--@mbg.generated-->
- <!--@Table rm_auto_report_last-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="controllerId" jdbcType="BIGINT" property="controllerid" />
- <result column="intakeId" jdbcType="BIGINT" property="intakeid" />
- <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
- <result column="dt" jdbcType="TIMESTAMP" property="dt" />
- <result column="rtuDt" jdbcType="TIMESTAMP" property="rtudt" />
- <result column="instantAmount" jdbcType="DOUBLE" property="instantamount" />
- <result column="totalAmount" jdbcType="DOUBLE" property="totalamount" />
- <result column="lossAmount" jdbcType="DOUBLE" property="lossamount" />
- <result column="waterPress" jdbcType="DOUBLE" property="waterpress" />
- <result column="batteryVolt" jdbcType="DOUBLE" property="batteryvolt" />
- <result column="sunVolt" jdbcType="DOUBLE" property="sunvolt" />
- <result column="signalValue" jdbcType="INTEGER" property="signalvalue" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, controllerId, intakeId, rtuAddr, dt, rtuDt, instantAmount, totalAmount, lossAmount,
- waterPress, batteryVolt, sunVolt, signalValue
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from rm_auto_report_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_auto_report_last
- where rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
- </select>
-
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from rm_auto_report_last
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast">
- <!--@mbg.generated-->
- insert into rm_auto_report_last (id, controllerId, intakeId,
- rtuAddr, dt, rtuDt, instantAmount,
- totalAmount, lossAmount, waterPress,
- batteryVolt, sunVolt, signalValue
- )
- values (#{id,jdbcType=BIGINT}, #{controllerid,jdbcType=BIGINT}, #{intakeid,jdbcType=BIGINT},
- #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtudt,jdbcType=TIMESTAMP}, #{instantamount,jdbcType=DOUBLE},
- #{totalamount,jdbcType=DOUBLE}, #{lossamount,jdbcType=DOUBLE}, #{waterpress,jdbcType=DOUBLE},
- #{batteryvolt,jdbcType=DOUBLE}, #{sunvolt,jdbcType=DOUBLE}, #{signalvalue,jdbcType=INTEGER}
- )
- </insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast">
- <!--@mbg.generated-->
- insert into rm_auto_report_last
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="controllerid != null">
- controllerId,
- </if>
- <if test="intakeid != null">
- intakeId,
- </if>
- <if test="rtuaddr != null">
- rtuAddr,
- </if>
- <if test="dt != null">
- dt,
- </if>
- <if test="rtudt != null">
- rtuDt,
- </if>
- <if test="instantamount != null">
- instantAmount,
- </if>
- <if test="totalamount != null">
- totalAmount,
- </if>
- <if test="lossamount != null">
- lossAmount,
- </if>
- <if test="waterpress != null">
- waterPress,
- </if>
- <if test="batteryvolt != null">
- batteryVolt,
- </if>
- <if test="sunvolt != null">
- sunVolt,
- </if>
- <if test="signalvalue != null">
- signalValue,
- </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="dt != null">
- #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="rtudt != null">
- #{rtudt,jdbcType=TIMESTAMP},
- </if>
- <if test="instantamount != null">
- #{instantamount,jdbcType=DOUBLE},
- </if>
- <if test="totalamount != null">
- #{totalamount,jdbcType=DOUBLE},
- </if>
- <if test="lossamount != null">
- #{lossamount,jdbcType=DOUBLE},
- </if>
- <if test="waterpress != null">
- #{waterpress,jdbcType=DOUBLE},
- </if>
- <if test="batteryvolt != null">
- #{batteryvolt,jdbcType=DOUBLE},
- </if>
- <if test="sunvolt != null">
- #{sunvolt,jdbcType=DOUBLE},
- </if>
- <if test="signalvalue != null">
- #{signalvalue,jdbcType=INTEGER},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast">
- <!--@mbg.generated-->
- update rm_auto_report_last
- <set>
- <if test="controllerid != null">
- controllerId = #{controllerid,jdbcType=BIGINT},
- </if>
- <if test="intakeid != null">
- intakeId = #{intakeid,jdbcType=BIGINT},
- </if>
- <if test="rtuaddr != null">
- rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
- </if>
- <if test="dt != null">
- dt = #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="rtudt != null">
- rtuDt = #{rtudt,jdbcType=TIMESTAMP},
- </if>
- <if test="instantamount != null">
- instantAmount = #{instantamount,jdbcType=DOUBLE},
- </if>
- <if test="totalamount != null">
- totalAmount = #{totalamount,jdbcType=DOUBLE},
- </if>
- <if test="lossamount != null">
- lossAmount = #{lossamount,jdbcType=DOUBLE},
- </if>
- <if test="waterpress != null">
- waterPress = #{waterpress,jdbcType=DOUBLE},
- </if>
- <if test="batteryvolt != null">
- batteryVolt = #{batteryvolt,jdbcType=DOUBLE},
- </if>
- <if test="sunvolt != null">
- sunVolt = #{sunvolt,jdbcType=DOUBLE},
- </if>
- <if test="signalvalue != null">
- signalValue = #{signalvalue,jdbcType=INTEGER},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast">
- <!--@mbg.generated-->
- update rm_auto_report_last
- set controllerId = #{controllerid,jdbcType=BIGINT},
- intakeId = #{intakeid,jdbcType=BIGINT},
- rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
- dt = #{dt,jdbcType=TIMESTAMP},
- rtuDt = #{rtudt,jdbcType=TIMESTAMP},
- instantAmount = #{instantamount,jdbcType=DOUBLE},
- totalAmount = #{totalamount,jdbcType=DOUBLE},
- lossAmount = #{lossamount,jdbcType=DOUBLE},
- waterPress = #{waterpress,jdbcType=DOUBLE},
- batteryVolt = #{batteryvolt,jdbcType=DOUBLE},
- sunVolt = #{sunvolt,jdbcType=DOUBLE},
- signalValue = #{signalvalue,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/RmTimingReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportHistoryMapper.xml
new file mode 100644
index 0000000..8b2b2e0
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportHistoryMapper.xml
@@ -0,0 +1,222 @@
+<?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.RmTimingReportHistoryMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory">
+ <!--@mbg.generated-->
+ <!--@Table rm_timing_report_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="dt" jdbcType="TIMESTAMP" property="dt" />
+ <result column="rtu_dt" jdbcType="TIMESTAMP" property="rtuDt" />
+ <result column="data_dt" jdbcType="DATE" property="dataDt" />
+ <result column="water_total_amount_year" jdbcType="FLOAT" property="waterTotalAmountYear" />
+ <result column="water_total_amount_meter" jdbcType="FLOAT" property="waterTotalAmountMeter" />
+ <result column="ele_total_amount_year" jdbcType="FLOAT" property="eleTotalAmountYear" />
+ <result column="ele_total_amount_meter" jdbcType="FLOAT" property="eleTotalAmountMeter" />
+ <result column="water_total_amount_day" jdbcType="FLOAT" property="waterTotalAmountDay" />
+ <result column="water_user_total_amount_day" jdbcType="FLOAT" property="waterUserTotalAmountDay" />
+ <result column="loss_total_amount_day" jdbcType="FLOAT" property="lossTotalAmountDay" />
+ <result column="battery_volt" jdbcType="FLOAT" property="batteryVolt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, controller_id, intake_id, rtu_addr, dt, rtu_dt, data_dt, water_total_amount_year,
+ water_total_amount_meter, ele_total_amount_year, ele_total_amount_meter, water_total_amount_day,
+ water_user_total_amount_day, loss_total_amount_day, battery_volt
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from rm_timing_report_history
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from rm_timing_report_history
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory">
+ <!--@mbg.generated-->
+ insert into rm_timing_report_history (id, controller_id, intake_id,
+ rtu_addr, dt, rtu_dt,
+ data_dt, water_total_amount_year, water_total_amount_meter,
+ ele_total_amount_year, ele_total_amount_meter, water_total_amount_day,
+ water_user_total_amount_day, loss_total_amount_day,
+ battery_volt)
+ values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP},
+ #{dataDt,jdbcType=DATE}, #{waterTotalAmountYear,jdbcType=FLOAT}, #{waterTotalAmountMeter,jdbcType=FLOAT},
+ #{eleTotalAmountYear,jdbcType=FLOAT}, #{eleTotalAmountMeter,jdbcType=FLOAT}, #{waterTotalAmountDay,jdbcType=FLOAT},
+ #{waterUserTotalAmountDay,jdbcType=FLOAT}, #{lossTotalAmountDay,jdbcType=FLOAT},
+ #{batteryVolt,jdbcType=FLOAT})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory">
+ <!--@mbg.generated-->
+ insert into rm_timing_report_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="dt != null">
+ dt,
+ </if>
+ <if test="rtuDt != null">
+ rtu_dt,
+ </if>
+ <if test="dataDt != null">
+ data_dt,
+ </if>
+ <if test="waterTotalAmountYear != null">
+ water_total_amount_year,
+ </if>
+ <if test="waterTotalAmountMeter != null">
+ water_total_amount_meter,
+ </if>
+ <if test="eleTotalAmountYear != null">
+ ele_total_amount_year,
+ </if>
+ <if test="eleTotalAmountMeter != null">
+ ele_total_amount_meter,
+ </if>
+ <if test="waterTotalAmountDay != null">
+ water_total_amount_day,
+ </if>
+ <if test="waterUserTotalAmountDay != null">
+ water_user_total_amount_day,
+ </if>
+ <if test="lossTotalAmountDay != null">
+ loss_total_amount_day,
+ </if>
+ <if test="batteryVolt != null">
+ battery_volt,
+ </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="dt != null">
+ #{dt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="rtuDt != null">
+ #{rtuDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="dataDt != null">
+ #{dataDt,jdbcType=DATE},
+ </if>
+ <if test="waterTotalAmountYear != null">
+ #{waterTotalAmountYear,jdbcType=FLOAT},
+ </if>
+ <if test="waterTotalAmountMeter != null">
+ #{waterTotalAmountMeter,jdbcType=FLOAT},
+ </if>
+ <if test="eleTotalAmountYear != null">
+ #{eleTotalAmountYear,jdbcType=FLOAT},
+ </if>
+ <if test="eleTotalAmountMeter != null">
+ #{eleTotalAmountMeter,jdbcType=FLOAT},
+ </if>
+ <if test="waterTotalAmountDay != null">
+ #{waterTotalAmountDay,jdbcType=FLOAT},
+ </if>
+ <if test="waterUserTotalAmountDay != null">
+ #{waterUserTotalAmountDay,jdbcType=FLOAT},
+ </if>
+ <if test="lossTotalAmountDay != null">
+ #{lossTotalAmountDay,jdbcType=FLOAT},
+ </if>
+ <if test="batteryVolt != null">
+ #{batteryVolt,jdbcType=FLOAT},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory">
+ <!--@mbg.generated-->
+ update rm_timing_report_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="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="rtuDt != null">
+ rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="dataDt != null">
+ data_dt = #{dataDt,jdbcType=DATE},
+ </if>
+ <if test="waterTotalAmountYear != null">
+ water_total_amount_year = #{waterTotalAmountYear,jdbcType=FLOAT},
+ </if>
+ <if test="waterTotalAmountMeter != null">
+ water_total_amount_meter = #{waterTotalAmountMeter,jdbcType=FLOAT},
+ </if>
+ <if test="eleTotalAmountYear != null">
+ ele_total_amount_year = #{eleTotalAmountYear,jdbcType=FLOAT},
+ </if>
+ <if test="eleTotalAmountMeter != null">
+ ele_total_amount_meter = #{eleTotalAmountMeter,jdbcType=FLOAT},
+ </if>
+ <if test="waterTotalAmountDay != null">
+ water_total_amount_day = #{waterTotalAmountDay,jdbcType=FLOAT},
+ </if>
+ <if test="waterUserTotalAmountDay != null">
+ water_user_total_amount_day = #{waterUserTotalAmountDay,jdbcType=FLOAT},
+ </if>
+ <if test="lossTotalAmountDay != null">
+ loss_total_amount_day = #{lossTotalAmountDay,jdbcType=FLOAT},
+ </if>
+ <if test="batteryVolt != null">
+ battery_volt = #{batteryVolt,jdbcType=FLOAT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory">
+ <!--@mbg.generated-->
+ update rm_timing_report_history
+ set controller_id = #{controllerId,jdbcType=BIGINT},
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+ dt = #{dt,jdbcType=TIMESTAMP},
+ rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+ data_dt = #{dataDt,jdbcType=DATE},
+ water_total_amount_year = #{waterTotalAmountYear,jdbcType=FLOAT},
+ water_total_amount_meter = #{waterTotalAmountMeter,jdbcType=FLOAT},
+ ele_total_amount_year = #{eleTotalAmountYear,jdbcType=FLOAT},
+ ele_total_amount_meter = #{eleTotalAmountMeter,jdbcType=FLOAT},
+ water_total_amount_day = #{waterTotalAmountDay,jdbcType=FLOAT},
+ water_user_total_amount_day = #{waterUserTotalAmountDay,jdbcType=FLOAT},
+ loss_total_amount_day = #{lossTotalAmountDay,jdbcType=FLOAT},
+ battery_volt = #{batteryVolt,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 6def3c1..adf2d6c 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
@@ -31,10 +31,6 @@
@Autowired
private RmAlarmStateHistoryMapper rmAlarmStateHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙叉姤璀﹀拰鐘舵�丏AO
@Autowired
- private RmAutoReportLastMapper rmAutoReportLastMapperDao ;//鎺у埗鍣ㄦ渶鏂颁笂鎶ユ暟鎹瓺AO
- @Autowired
- private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙蹭笂鎶ユ暟鎹瓺AO
- @Autowired
private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapperDao ;//鎺у埗鍣ㄦ渶鏂板紑鍏抽榾涓婃姤鏁版嵁DAO
@Autowired
private RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插紑鍏抽榾涓婃姤鏁版嵁DAO
@@ -156,47 +152,9 @@
/////////////////////////////////////////////////
//
- // 涓诲姩涓婃姤鏁版嵁鍔熻兘
+ // 瀹氱偣鎶ユ暟鎹姛鑳�
//
////////////////////////////////////////////////
- /**
- * 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param rtuAddr
- * @return
- */
- public RmAutoReportLast getRmAutoReportLast(String rtuAddr){
- List<RmAutoReportLast> list = rmAutoReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
- if(list != null && list.size() > 0){
- return list.get(0) ;
- }
- return null ;
- }
- /**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.insert(po) ;
- }
- /**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void updateRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.updateByPrimaryKeySelective(po) ;
- }
- /**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportHistory(RmAutoReportHistory po){
- this.rmAutoReportHistoryMapperDao.insert(po) ;
- }
-
-
/////////////////////////////////////////////////
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
index 30f51c0..0ccee24 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
@@ -1,14 +1,11 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
-import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.util.DateTime;
-import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory;
-import com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -56,19 +53,19 @@
* @param dataCdC0Vo 鑷姤鏁版嵁瀵硅薄
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
- RmAutoReportLast po = sv.getRmAutoReportLast(rtuAddr) ;
- if(po == null){
- po = new RmAutoReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
- dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
- dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
- sv.saveRmAutoReportLast(po) ;
- }else{
- po = this.update(controller, po, dV1_0_1, dataCdC0Vo) ;
- sv.updateRmAutoReportLast(po);
- }
+ //RmAutoReportLast po = sv.getRmAutoReportLast(rtuAddr) ;
+ //if(po == null){
+ // po = new RmAutoReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getId(),
+ // rtuAddr,
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
+ // dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
+ // dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
+ // sv.saveRmAutoReportLast(po) ;
+ //}else{
+ // po = this.update(controller, po, dV1_0_1, dataCdC0Vo) ;
+ // sv.updateRmAutoReportLast(po);
+ //}
}
/**
@@ -78,31 +75,31 @@
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param dataCdC0Vo 鑷姤鏁版嵁瀵硅薄
*/
- private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
- RmAutoReportHistory po = new RmAutoReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
- rtuAddr,
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
- DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
- dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
- dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
- sv.saveRmAutoReportHistory(po) ;
- }
+ //private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
+ // RmAutoReportHistory po = new RmAutoReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
+ // rtuAddr,
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
+ // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
+ // dataCdC0Vo.instantAmount, dataCdC0Vo.totalAmount, dataCdC0Vo.lossAmount,
+ // dataCdC0Vo.waterPress, dataCdC0Vo.batteryVolt, dataCdC0Vo.sunVolt, dataCdC0Vo.signalValue) ;
+ // sv.saveRmAutoReportHistory(po) ;
+ //}
- private RmAutoReportLast update(PrController controller, RmAutoReportLast po, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
- po.controllerid = controller==null?null:controller.getId();
- po.intakeid = controller==null?null:controller.getIntakeId();
-
- po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
- po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
- po.instantamount = dataCdC0Vo.instantAmount;
- po.totalamount = dataCdC0Vo.totalAmount;
- po.lossamount = dataCdC0Vo.lossAmount;
- po.waterpress = dataCdC0Vo.waterPress;
- po.batteryvolt = dataCdC0Vo.batteryVolt;
- po.sunvolt = dataCdC0Vo.sunVolt;
- po.signalvalue = dataCdC0Vo.signalValue;
- return po ;
- }
+ //private RmAutoReportLast update(PrController controller, RmAutoReportLast po, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
+ // po.controllerid = controller==null?null:controller.getId();
+ // po.intakeid = controller==null?null:controller.getIntakeId();
+ //
+ // po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ // po.rtudt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
+ // po.instantamount = dataCdC0Vo.instantAmount;
+ // po.totalamount = dataCdC0Vo.totalAmount;
+ // po.lossamount = dataCdC0Vo.lossAmount;
+ // po.waterpress = dataCdC0Vo.waterPress;
+ // po.batteryvolt = dataCdC0Vo.batteryVolt;
+ // po.sunvolt = dataCdC0Vo.sunVolt;
+ // po.signalvalue = dataCdC0Vo.signalValue;
+ // return po ;
+ //}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java
index a91afb1..687fabb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java
@@ -41,7 +41,6 @@
/*
* 鏀粯缁撴灉閫氱煡API
*/
- //public static String notifyUrl = "https://www.muxiaobao.com/api/Payment/OrderNotify";
public static String notifyUrl = "https://44978f7456.imdo.co/sell/payment/orderNotify";
/*
@@ -67,12 +66,14 @@
/*
* 灏忕▼搴忓敮涓�鏍囪瘑
*/
- public static String appid = "wxbc2b6a00dd904ead";
+ //public static String appid = "wxbc2b6a00dd904ead";
+ public static String appid = "wxf773810cd5643196";
/*
* 灏忕▼搴忕殑 app secret
*/
- public static String secret = "796ffe3e9921f756db0499e80d6ed0cd";
+ //public static String secret = "796ffe3e9921f756db0499e80d6ed0cd";
+ public static String secret = "080d4f947095551e988cfe9338e27f15";
/*
* 灏忕▼搴忕殑鎺堟潈绫诲瀷锛岀櫥褰曞嚟璇佹牎楠屼娇鐢�
--
Gitblit v1.8.0