From 7f3cae29516a35e85e4b6fc02ec655882d4c2538 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 08 五月 2025 11:55:24 +0800 Subject: [PATCH] 1、测控一体阀协议功能码50补充实现; 2、RTU模拟器模拟实现50、91、92功能码上报; 3、remote模块:完善透传命令实现,完善接收通信中间件返回命令结果实现。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDaySv.java | 72 ++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDaySv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDaySv.java new file mode 100644 index 0000000..133ed16 --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDaySv.java @@ -0,0 +1,72 @@ +package com.dy.pipIrrRemote.records.clientAmountDay; + +import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayLastMapper; +import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper; +import com.dy.pipIrrGlobal.voRm.VoClientAmountDay; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.common.utils.PojoUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @author :WuZeYu + * @Date :2024/7/24 14:30 + * @LastEditTime :2024/7/24 14:30 + * @Description + */ +@Slf4j +@Service +public class ClientAmountDaySv { + + @Autowired + private RmClientAmountDayMapper rmClientAmountDayMapper; + @Autowired + private RmClientAmountDayLastMapper rmClientAmountDayLastMapper; + + + /** + * 鑾峰緱涓�椤靛啘鎴锋棩鐢ㄦ按閲忕粺璁¤褰�(鍘嗗彶) + * @param vo + * @return + */ + public QueryResultVo<List<VoClientAmountDay>> getClientAmountDayHistory(ClientAmountDayQueryVo vo) { + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); + + Long itemTotal = rmClientAmountDayMapper.getRecordCount(params); + + QueryResultVo<List<VoClientAmountDay>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = vo.pageSize; + rsVo.pageCurr = vo.pageCurr; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = rmClientAmountDayMapper.getClientAmountDayHistory(params); + return rsVo; + } + + + + /** + * 鑾峰緱涓�椤靛啘鎴锋棩鐢ㄦ按閲忕粺璁¤褰�(鏈�鏂�) + * @param vo + * @return + */ + public QueryResultVo<List<VoClientAmountDay>> getClientAmountDayLast(ClientAmountDayQueryVo vo) { + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); + + Long itemTotal = rmClientAmountDayLastMapper.getRecordCount(params); + + QueryResultVo<List<VoClientAmountDay>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = vo.pageSize; + rsVo.pageCurr = vo.pageCurr; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = rmClientAmountDayLastMapper.getClientAmountDayLast(params); + return rsVo; + } +} -- Gitblit v1.8.0