From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 29 八月 2024 10:11:04 +0800 Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java, 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java index 0efdb8a..6d453c3 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java @@ -2,11 +2,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard; +import com.dy.pipIrrGlobal.voSe.VoCardInfo1; +import com.dy.pipIrrGlobal.voSe.VoVcRecharge; import com.dy.pipIrrGlobal.voSe.VoVirtualCard; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @author ZhuBaoMin @@ -41,7 +44,7 @@ * 鑾峰彇鍐滄埛鍏ㄩ儴铏氭嫙鍗� * @return */ - List<VoVirtualCard> getVCs(@Param("clientId") Long clientId); + List<VoVirtualCard> getVCs(@Param("alarmValue") Integer alarmValue, @Param("clientId") Long clientId); /** * 鏍规嵁铏氭嫙鍗D鑾峰彇铏氭嫙鍗″璞� @@ -49,6 +52,27 @@ * @return */ VoVirtualCard getVcById(@Param("vcId") Long vcId); + + /** + * 鏍规嵁铏氭嫙鍗$紪鍙疯幏鍙栬櫄鎷熷崱 + * @param vcNum + * @return + */ + SeVirtualCard getVcCardByNum(@Param("vcNum") String vcNum); + + /** + * 鏍规嵁铏氭嫙姘村崱缂栧彿鑾峰彇瀵瑰簲鐨勫啘鎴穒d鍜屽鍚� + * @param vcNum + * @return + */ + Map getClientIdAndNameByVsCardNo(@Param("vcNum") Long vcNum); + + /** + * 寰楀埌姘村崱瀵硅薄 + * @param cardNum + * @return + */ + List<VoCardInfo1> getCardsByNum(@Param("cardNum") Long cardNum); /** * 鏍规嵁铏氭嫙鍗$紪鍙疯幏鍙栬櫄鎷熷崱ID @@ -63,4 +87,31 @@ * @return */ String getVcCardNumOfMax(@Param("areaCode") String areaCode); + + /** + * 涓�涓彇姘村彛涓婂崰鐢ㄧ殑铏氭嫙鍗$姸鎬佸彉鎴愪笉鍗犵敤 + * @param intakeId + * @return + */ + void updateVcCardNoUseStateByIntakeId(@Param("intakeId")Long intakeId) ; + + /** + * 鑾峰彇铏氭嫙鍗″厖鍊艰褰� + * @return + */ + List<VoVcRecharge> getVcRechargeRecords(Map<?, ?> params); + + /** + * 鑾峰彇铏氭嫙鍗″厖鍊艰褰曟暟 + * @param params + * @return + */ + Long getRechargeRecordCount(Map<?, ?> params); + + /** + * 鏇存柊瀹炰綋鍗″墿浣欓噾棰� + * @param id + * @param money + */ + void updateMoney(@Param("id")Long id , @Param("money")Double money); } \ No newline at end of file -- Gitblit v1.8.0