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 * pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportHistoryMapper.java
File was deleted pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAutoReportLastMapper.java
File was deleted 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;
New file @@ -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); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportHistory.java
File was deleted pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmAutoReportLast.java
File was deleted pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
New file @@ -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; /** * 控制器实体ID（外键） */ private Long controllerId; /** * 取水口实体ID（外键） */ 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; } pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportHistoryMapper.xml
File was deleted pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml
File was deleted pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportHistoryMapper.xml
New file @@ -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> 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 ;//控制器历史报警和状态DAO @Autowired private RmAutoReportLastMapper rmAutoReportLastMapperDao ;//控制器最新上报数据DAO @Autowired private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//控制器历史上报数据DAO @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) ; } ///////////////////////////////////////////////// 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 ; //} }
@@ -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"; /* * 小程序的授权类型，登录凭证校验使用
