diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java index 8caf8132..abf8fc57 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java @@ -89,7 +89,6 @@ public interface FireRecordMapper { List datalistPageV2(Page page); - List datalistPageV3(Page page); List datalistPage(Page page); List getCheckingByCid(String fireCheckId); diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java index 54caa768..e10279e6 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java @@ -80,7 +80,6 @@ public interface FireRecordService { List getCheckListByApp(Page page); List getCheckListByAppV2(Page page); - List getCheckListByAppV3(Page page); List getCheckRecordByPid(PageData pd); /** diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java index 7a307fa2..3c7fbdcc 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java @@ -723,11 +723,6 @@ public class FireRecordServiceImpl implements FireRecordService { return data; } - @Override - public List getCheckListByAppV3(Page page) { - List data = fireRecordMapper.datalistPageV3(page); - return data; - } @Override public List getCheckRecordByPid(PageData pd) { return fireRecordMapper.getCheckRecordByPid(pd); diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml index 24f3cd6b..9cde531e 100644 --- a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SYS_MENU + sys_menu2 diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index bd0a81ec..29996134 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -1031,58 +1031,5 @@ frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID} AND frp.ISDELETE = '0' - diff --git a/src/main/resources/mybatis/datasource/system/MenuMapper.xml b/src/main/resources/mybatis/datasource/system/MenuMapper.xml index b8ffb1ba..cc6123ea 100644 --- a/src/main/resources/mybatis/datasource/system/MenuMapper.xml +++ b/src/main/resources/mybatis/datasource/system/MenuMapper.xml @@ -34,7 +34,7 @@ - SYS_MENU + sys_menu2