by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master #6

Merged
bichangxiong merged 8 commits from master into prod 2025-09-08 18:51:12 +08:00
Conversation 0 Commits 8 Files Changed 42 +10 -7
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 71c82fa345 - Show all commits

6
pom.xml
View File

@@ -74,12 +74,12 @@
<properties> <properties>
<!-- 环境标识，需要与配置文件的名称相对应 --> <!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active> <profiles.active>dev</profiles.active>
<nacos.server>10.20.1.65:8848</nacos.server> <nacos.server>113.249.101.254:8848</nacos.server>
<logstash.address>10.20.1.65:4560</logstash.address> <logstash.address>113.249.101.254:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group> <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group> <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username> <nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password> <nacos.password>by@2025??</nacos.password>
</properties> </properties>
<activation> <activation>
<!-- 默认环境 --> <!-- 默认环境 -->

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
*/ */
public interface SisAlarmEventsMapper extends BaseMapperPlus<SisAlarmEvents, SisAlarmEventsVo> { public interface SisAlarmEventsMapper extends BaseMapperPlus<SisAlarmEvents, SisAlarmEventsVo> {
List<QueryStatisticsAlarmVo> queryStatisticsCurrDay(@Param("now") Date now); List<QueryStatisticsAlarmVo> queryStatisticsCurrDay(@Param("start") Date start, @Param("end") Date end);
List<QueryStatisticsAlarmVo> queryStatistics(); List<QueryStatisticsAlarmVo> queryStatistics();

5
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.dev33.satoken.context.mock.SaTokenContextMockUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -354,7 +355,9 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
@Override @Override
public List<QueryStatisticsAlarmVo> queryStatisticsCurrDay() { public List<QueryStatisticsAlarmVo> queryStatisticsCurrDay() {
Date now = new Date(); Date now = new Date();
return this.baseMapper.queryStatisticsCurrDay(now); DateTime start = DateUtil.beginOfDay(now);
DateTime end = DateUtil.endOfDay(now);
return this.baseMapper.queryStatisticsCurrDay(start, end);
} }
@Override @Override

4
ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml
View File

@@ -8,8 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT small_type typeCode, SELECT small_type typeCode,
sum(1) total sum(1) total
FROM `sis_alarm_events` FROM `sis_alarm_events`
WHERE report_time BETWEEN #{now} WHERE report_time BETWEEN #{start}
AND #{now} AND #{end}
GROUP BY small_type GROUP BY small_type
</select> </select>
<select id="queryStatistics" resultType="org.dromara.sis.domain.vo.QueryStatisticsAlarmVo"> <select id="queryStatistics" resultType="org.dromara.sis.domain.vo.QueryStatisticsAlarmVo">