From 0117a0eab0b5f9bf21b6e2cdbf6d71aeca798b51 Mon Sep 17 00:00:00 2001 From: wu Date: Thu, 6 Jun 2024 09:23:05 +0800 Subject: [PATCH] bugfix --- .../com/ruoyi/page/mapper/AlarmMapper.java | 22 +-- .../com/ruoyi/page/mapper/EventMapper.java | 17 ++- .../page/service/impl/AlarmServiceImpl.java | 42 +++--- .../page/service/impl/EventServiceImpl.java | 36 ++--- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../ruoyi/framework/config/MyBatisConfig.java | 132 ------------------ .../framework/config/MybatisPlusConfig.java | 2 +- 8 files changed, 53 insertions(+), 202 deletions(-) delete mode 100644 RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java index c8a795c..b698fe4 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java @@ -1,21 +1,21 @@ package com.ruoyi.page.mapper; -import java.util.List; import com.ruoyi.page.domain.Alarm; import com.ruoyi.page.domain.dto.request.AlarmFindRequest; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 报警事件Mapper接口 - * + * * @author ruoyi * @date 2024-05-30 */ -public interface AlarmMapper -{ +public interface AlarmMapper { /** * 查询报警事件 - * + * * @param emergencyEventId 报警事件主键 * @return 报警事件 */ @@ -23,15 +23,15 @@ public interface AlarmMapper /** * 查询报警事件列表 - * + * * @param req 报警事件 * @return 报警事件集合 */ - public List selectAlarmList(@Param("req")AlarmFindRequest req); + public List selectAlarmList(@Param("req") AlarmFindRequest req); /** * 新增报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @@ -39,7 +39,7 @@ public interface AlarmMapper /** * 修改报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @@ -47,7 +47,7 @@ public interface AlarmMapper /** * 删除报警事件 - * + * * @param emergencyEventId 报警事件主键 * @return 结果 */ @@ -55,7 +55,7 @@ public interface AlarmMapper /** * 批量删除报警事件 - * + * * @param emergencyEventIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java index 2a6c39e..631922a 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java @@ -8,15 +8,14 @@ import java.util.List; /** * 事故Mapper接口 - * + * * @author ruoyi * @date 2024-05-30 */ -public interface EventMapper -{ +public interface EventMapper { /** * 查询事故 - * + * * @param eventId 事故主键 * @return 事故 */ @@ -24,7 +23,7 @@ public interface EventMapper /** * 查询事故列表 - * + * * @param event 事故 * @return 事故集合 */ @@ -32,7 +31,7 @@ public interface EventMapper /** * 新增事故 - * + * * @param event 事故 * @return 结果 */ @@ -40,7 +39,7 @@ public interface EventMapper /** * 修改事故 - * + * * @param event 事故 * @return 结果 */ @@ -48,7 +47,7 @@ public interface EventMapper /** * 删除事故 - * + * * @param eventId 事故主键 * @return 结果 */ @@ -56,7 +55,7 @@ public interface EventMapper /** * 批量删除事故 - * + * * @param eventIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java index 0ca328b..42fc880 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java @@ -1,99 +1,91 @@ package com.ruoyi.page.service.impl; -import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.page.domain.Alarm; import com.ruoyi.page.domain.dto.request.AlarmFindRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.page.mapper.AlarmMapper; -import com.ruoyi.page.domain.Alarm; import com.ruoyi.page.service.IAlarmService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 报警事件Service业务层处理 - * + * * @author ruoyi * @date 2024-05-30 */ @Service -public class AlarmServiceImpl implements IAlarmService -{ +public class AlarmServiceImpl implements IAlarmService { @Resource private AlarmMapper alarmMapper; /** * 查询报警事件 - * + * * @param emergencyEventId 报警事件主键 * @return 报警事件 */ @Override - public Alarm selectAlarmByEmergencyEventId(Long emergencyEventId) - { + public Alarm selectAlarmByEmergencyEventId(Long emergencyEventId) { return alarmMapper.selectAlarmByEmergencyEventId(emergencyEventId); } /** * 查询报警事件列表 - * + * * @param req 报警事件 * @return 报警事件 */ @Override - public List selectAlarmList(AlarmFindRequest req) - { + public List selectAlarmList(AlarmFindRequest req) { return alarmMapper.selectAlarmList(req); } /** * 新增报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @Override - public int insertAlarm(Alarm alarm) - { + public int insertAlarm(Alarm alarm) { alarm.setCreateTime(DateUtils.getNowDate()); return alarmMapper.insertAlarm(alarm); } /** * 修改报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @Override - public int updateAlarm(Alarm alarm) - { + public int updateAlarm(Alarm alarm) { alarm.setUpdateTime(DateUtils.getNowDate()); return alarmMapper.updateAlarm(alarm); } /** * 批量删除报警事件 - * + * * @param emergencyEventIds 需要删除的报警事件主键 * @return 结果 */ @Override - public int deleteAlarmByEmergencyEventIds(Long[] emergencyEventIds) - { + public int deleteAlarmByEmergencyEventIds(Long[] emergencyEventIds) { return alarmMapper.deleteAlarmByEmergencyEventIds(emergencyEventIds); } /** * 删除报警事件信息 - * + * * @param emergencyEventId 报警事件主键 * @return 结果 */ @Override - public int deleteAlarmByEmergencyEventId(Long emergencyEventId) - { + public int deleteAlarmByEmergencyEventId(Long emergencyEventId) { return alarmMapper.deleteAlarmByEmergencyEventId(emergencyEventId); } } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java index ab311ea..79bed2f 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java @@ -4,7 +4,6 @@ import com.ruoyi.page.domain.Event; import com.ruoyi.page.domain.dto.request.EventPageRequest; import com.ruoyi.page.mapper.EventMapper; import com.ruoyi.page.service.IEventService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -13,85 +12,78 @@ import java.util.List; /** * 事故Service业务层处理 - * + * * @author ruoyi * @date 2024-05-30 */ @Service -public class EventServiceImpl implements IEventService -{ +public class EventServiceImpl implements IEventService { @Resource private EventMapper eventMapper; /** * 查询事故 - * + * * @param eventId 事故主键 * @return 事故 */ @Override - public Event selectEventByEventId(String eventId) - { + public Event selectEventByEventId(String eventId) { return eventMapper.selectEventByEventId(eventId); } /** * 查询事故列表 - * + * * @param req 事故 * @return 事故 */ @Override - public List selectEventList(EventPageRequest req) - { + public List selectEventList(EventPageRequest req) { return eventMapper.selectEventList(req); } /** * 新增事故 - * + * * @param event 事故 * @return 结果 */ @Override - public int insertEvent(Event event) - { + public int insertEvent(Event event) { return eventMapper.insertEvent(event); } /** * 修改事故 - * + * * @param event 事故 * @return 结果 */ @Override - public int updateEvent(Event event) - { + public int updateEvent(Event event) { return eventMapper.updateEvent(event); } /** * 批量删除事故 - * + * * @param eventIds 需要删除的事故主键 * @return 结果 */ @Override - public int deleteEventByEventIds(String[] eventIds) - { + public int deleteEventByEventIds(String[] eventIds) { return eventMapper.deleteEventByEventIds(eventIds); } /** * 删除事故信息 - * + * * @param eventId 事故主键 * @return 结果 */ @Override - public int deleteEventByEventId(String eventId) - { + public int deleteEventByEventId(String eventId) { return eventMapper.deleteEventByEventId(eventId); } } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml index 661af40..a3a7ec1 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml +++ b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: root + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml index ea8ecf3..09729ee 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml +++ b/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml @@ -21,7 +21,7 @@ server: port: 9007 servlet: # 应用的访问路径 - context-path: / + context-path: /api tomcat: # tomcat的URI编码 uri-encoding: UTF-8 diff --git a/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java deleted file mode 100644 index 057c941..0000000 --- a/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.ruoyi.framework.config; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import javax.sql.DataSource; -import org.apache.ibatis.io.VFS; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * Mybatis支持*匹配扫描包 - * - * @author ruoyi - */ -@Configuration -public class MyBatisConfig -{ - @Autowired - private Environment env; - - static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; - - public static String setTypeAliasesPackage(String typeAliasesPackage) - { - ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); - MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); - List allResult = new ArrayList(); - try - { - for (String aliasesPackage : typeAliasesPackage.split(",")) - { - List result = new ArrayList(); - aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; - Resource[] resources = resolver.getResources(aliasesPackage); - if (resources != null && resources.length > 0) - { - MetadataReader metadataReader = null; - for (Resource resource : resources) - { - if (resource.isReadable()) - { - metadataReader = metadataReaderFactory.getMetadataReader(resource); - try - { - result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - } - } - } - if (result.size() > 0) - { - HashSet hashResult = new HashSet(result); - allResult.addAll(hashResult); - } - } - if (allResult.size() > 0) - { - typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); - } - else - { - throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); - } - } - catch (IOException e) - { - e.printStackTrace(); - } - return typeAliasesPackage; - } - - public Resource[] resolveMapperLocations(String[] mapperLocations) - { - ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - List resources = new ArrayList(); - if (mapperLocations != null) - { - for (String mapperLocation : mapperLocations) - { - try - { - Resource[] mappers = resourceResolver.getResources(mapperLocation); - resources.addAll(Arrays.asList(mappers)); - } - catch (IOException e) - { - // ignore - } - } - } - return resources.toArray(new Resource[resources.size()]); - } - - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } -} \ No newline at end of file diff --git a/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index f712180..9fba706 100644 --- a/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -40,7 +40,7 @@ public class MybatisPlusConfig // 设置数据库类型为mysql paginationInnerInterceptor.setDbType(DbType.MYSQL); // 设置最大单页限制数量，默认 500 条，-1 不受限制 - paginationInnerInterceptor.setMaxLimit(-1L); + paginationInnerInterceptor.setMaxLimit(1000L); return paginationInnerInterceptor; }