diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 038af9f..ff737d4 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -74,6 +74,12 @@ knife4j-spring-boot-starter 3.0.3 + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 038af9f..ff737d4 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -74,6 +74,12 @@ knife4j-spring-boot-starter 3.0.3 + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 5a0adf2..c05873d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -30,6 +30,7 @@ this.permissionService = permissionService; } + @Override public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { @@ -46,6 +47,7 @@ return responseData; } + @Override public Object addDeptPermission(DeptPermission deptPermission) { ResponseData responseData = new ResponseData(); try { @@ -61,6 +63,7 @@ return responseData; } + @Override public Object editDeptPermission(DeptPermission deviceImei) { ResponseData responseData = new ResponseData(); if (ObjectUtil.isEmpty(deviceImei.getId())) { @@ -80,6 +83,7 @@ return responseData; } + @Override public Object deleteDeptPermission(Long id) { ResponseData responseData = new ResponseData(); try { diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 038af9f..ff737d4 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -74,6 +74,12 @@ knife4j-spring-boot-starter 3.0.3 + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 5a0adf2..c05873d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -30,6 +30,7 @@ this.permissionService = permissionService; } + @Override public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { @@ -46,6 +47,7 @@ return responseData; } + @Override public Object addDeptPermission(DeptPermission deptPermission) { ResponseData responseData = new ResponseData(); try { @@ -61,6 +63,7 @@ return responseData; } + @Override public Object editDeptPermission(DeptPermission deviceImei) { ResponseData responseData = new ResponseData(); if (ObjectUtil.isEmpty(deviceImei.getId())) { @@ -80,6 +83,7 @@ return responseData; } + @Override public Object deleteDeptPermission(Long id) { ResponseData responseData = new ResponseData(); try { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java index caf4fed..47eb94d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; @@ -22,6 +23,7 @@ @Service @Slf4j +@DS("log") @AllArgsConstructor public class MetaModuleServiceImpl extends ServiceImpl implements MetaModuleService { diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 038af9f..ff737d4 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -74,6 +74,12 @@ knife4j-spring-boot-starter 3.0.3 + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 5a0adf2..c05873d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -30,6 +30,7 @@ this.permissionService = permissionService; } + @Override public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { @@ -46,6 +47,7 @@ return responseData; } + @Override public Object addDeptPermission(DeptPermission deptPermission) { ResponseData responseData = new ResponseData(); try { @@ -61,6 +63,7 @@ return responseData; } + @Override public Object editDeptPermission(DeptPermission deviceImei) { ResponseData responseData = new ResponseData(); if (ObjectUtil.isEmpty(deviceImei.getId())) { @@ -80,6 +83,7 @@ return responseData; } + @Override public Object deleteDeptPermission(Long id) { ResponseData responseData = new ResponseData(); try { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java index caf4fed..47eb94d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; @@ -22,6 +23,7 @@ @Service @Slf4j +@DS("log") @AllArgsConstructor public class MetaModuleServiceImpl extends ServiceImpl implements MetaModuleService { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..8e600be 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -167,6 +167,12 @@ 1.8 + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 038af9f..ff737d4 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -74,6 +74,12 @@ knife4j-spring-boot-starter 3.0.3 + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 5a0adf2..c05873d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -30,6 +30,7 @@ this.permissionService = permissionService; } + @Override public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { @@ -46,6 +47,7 @@ return responseData; } + @Override public Object addDeptPermission(DeptPermission deptPermission) { ResponseData responseData = new ResponseData(); try { @@ -61,6 +63,7 @@ return responseData; } + @Override public Object editDeptPermission(DeptPermission deviceImei) { ResponseData responseData = new ResponseData(); if (ObjectUtil.isEmpty(deviceImei.getId())) { @@ -80,6 +83,7 @@ return responseData; } + @Override public Object deleteDeptPermission(Long id) { ResponseData responseData = new ResponseData(); try { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java index caf4fed..47eb94d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; @@ -22,6 +23,7 @@ @Service @Slf4j +@DS("log") @AllArgsConstructor public class MetaModuleServiceImpl extends ServiceImpl implements MetaModuleService { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..8e600be 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -167,6 +167,12 @@ 1.8 + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml index 85de3cb..f94ed65 100644 --- a/casic-web/src/main/resources/config/application-dm.yml +++ b/casic-web/src/main/resources/config/application-dm.yml @@ -3,10 +3,24 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:dm://111.198.10.15:11211/schema=SMARTWELL?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:dm://10.80.1.157:5236/schema=XLJC?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull driver-class-name: dm.jdbc.driver.DmDriver - username: SMARTWELL - password: Casic20311 + username: XLJC + password: Xljc@2023 + dynamic: + primary: master #设置默认的数据源或者数据源组,默认值即为master + strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 + datasource: + master: + url: jdbc:dm://10.80.1.157:5236/schema=XLJC?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + driver-class-name: dm.jdbc.driver.DmDriver + username: XLJC + password: Xljc@2023 + log: + url: jdbc:dm://10.80.1.158:5236/CASIC203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + driver-class-name: dm.jdbc.driver.DmDriver + username: XLJC + password: Xljc@2023 session: store-type: redis redis: diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index af416cb..26a0d27 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -105,6 +105,12 @@ test + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java index 38e6c48..c623783 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; @@ -20,6 +21,7 @@ * @since 2019-05-17 */ @Service +@DS("log") public class AlarmNowViewServiceImpl extends ServiceImpl implements IAlarmNowViewService { @Resource diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java index 9c5f957..daa4cda 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/DataScopeBuilder.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.casic.missiles.modular.system.dao.DataScopeMapper; import com.casic.missiles.modular.system.model.User; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import java.util.stream.Collectors; @Service +@DS("log") public class DataScopeBuilder { private final DataScopeMapper dataScopeMapper; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index bf3bb38..c48c733 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -26,6 +27,7 @@ @Slf4j @Service +@DS("log") public class StatisticServiceImpl implements IStatisticsService { @Resource private StatisticMapper statisticMapper; @@ -132,6 +134,7 @@ return mapList; } + @Override public Integer countNowAlarmRecords(DataScope dataScope,String alarmType){ return statisticMapper.countNowAlarmRecords( dataScope, alarmType); } diff --git a/casic-data-analysis/pom.xml b/casic-data-analysis/pom.xml index a72e28d..4f24089 100644 --- a/casic-data-analysis/pom.xml +++ b/casic-data-analysis/pom.xml @@ -40,6 +40,12 @@ casic-server-support ${pro.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index b2d0984..008630c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -24,6 +25,7 @@ */ @Slf4j @Component +@DS("log") public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 06ecb2a..3098c64 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -41,6 +42,7 @@ */ @Slf4j @Component +@DS("log") public class IDataAnalysisServiceImpl extends ServiceImpl implements IDataAnalysisService { @Resource private AbstractDictService dictService; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 5ee7042..c8b8550 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; @@ -21,6 +22,7 @@ @Slf4j @Service +@DS("log") public class ThirdPartyDataServiceImpl implements ThirdPartyDataService { private final ThirdPartyDataMapper thirdPartyMapper; @@ -78,6 +80,7 @@ * * @return */ + @Override public ResponseData countThirdPartyData(DataScope dataScope, String endTime, String beginTime) { ResponseData responseData = new ResponseData(); try { @@ -107,6 +110,7 @@ * * @return int 数据条数 */ + @Override public ResponseData countThirdPartyDataToday(DataScope dataScope) { ResponseData responseData = new ResponseData(); Date date = new Date(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 038af9f..ff737d4 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -74,6 +74,12 @@ knife4j-spring-boot-starter 3.0.3 + + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 5a0adf2..c05873d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -30,6 +30,7 @@ this.permissionService = permissionService; } + @Override public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { @@ -46,6 +47,7 @@ return responseData; } + @Override public Object addDeptPermission(DeptPermission deptPermission) { ResponseData responseData = new ResponseData(); try { @@ -61,6 +63,7 @@ return responseData; } + @Override public Object editDeptPermission(DeptPermission deviceImei) { ResponseData responseData = new ResponseData(); if (ObjectUtil.isEmpty(deviceImei.getId())) { @@ -80,6 +83,7 @@ return responseData; } + @Override public Object deleteDeptPermission(Long id) { ResponseData responseData = new ResponseData(); try { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java index caf4fed..47eb94d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MetaModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; @@ -22,6 +23,7 @@ @Service @Slf4j +@DS("log") @AllArgsConstructor public class MetaModuleServiceImpl extends ServiceImpl implements MetaModuleService { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..8e600be 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -167,6 +167,12 @@ 1.8 + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 + + diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml index 85de3cb..f94ed65 100644 --- a/casic-web/src/main/resources/config/application-dm.yml +++ b/casic-web/src/main/resources/config/application-dm.yml @@ -3,10 +3,24 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:dm://111.198.10.15:11211/schema=SMARTWELL?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:dm://10.80.1.157:5236/schema=XLJC?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull driver-class-name: dm.jdbc.driver.DmDriver - username: SMARTWELL - password: Casic20311 + username: XLJC + password: Xljc@2023 + dynamic: + primary: master #设置默认的数据源或者数据源组,默认值即为master + strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 + datasource: + master: + url: jdbc:dm://10.80.1.157:5236/schema=XLJC?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + driver-class-name: dm.jdbc.driver.DmDriver + username: XLJC + password: Xljc@2023 + log: + url: jdbc:dm://10.80.1.158:5236/CASIC203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + driver-class-name: dm.jdbc.driver.DmDriver + username: XLJC + password: Xljc@2023 session: store-type: redis redis: diff --git a/pom.xml b/pom.xml index 040ce65..9f132f7 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,11 @@ 2.4.5 - + + com.baomidou + dynamic-datasource-spring-boot-starter + 2.5.4 +