From 74b5d60307823de027c220d9a5e98ce6104822aa Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 31 十月 2024 09:12:55 +0800 Subject: [PATCH] 汉字“整点”改为"定点",为了以后兼容王江海制定的协议 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java index 54f2dde..a2f274c 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java @@ -14,8 +14,6 @@ import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.stereotype.Service; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -105,8 +103,8 @@ List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params); if (list != null && list.size() > 0) { for (VoOpenCloseValve vo : list) { - vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_())); - vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_())); + vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType())); + vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType())); } } rsVo.obj = list; @@ -132,8 +130,8 @@ List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params); if (list != null && list.size() > 0) { for (VoOpenCloseValve vo : list) { - vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_())); - vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_())); + vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType())); + vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType())); } } rsVo.obj = list; -- Gitblit v1.8.0