diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordMapper.java index ad0eacb9..d320755f 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordMapper.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordMapper.java @@ -19,4 +19,7 @@ public interface RiskRecordMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); @Select("select * from risk_alarm where positionSid=#{shSid} and indicatorCode=#{code} order by triggerTime desc limit 1") RiskRecordVo getRiskRecord(@Param("shSid")String shSid,@Param("code")String code); + @Select("select count(id) from risk_record where date>=#{startDate} and date<=#{endDate} ") + Integer getCount(@Param("startDate")String startDate,@Param("endDate")String endDate); + } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java index 12548872..e0ba8a1e 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java @@ -1,6 +1,8 @@ package com.supervise.rms.biz.riskrecord; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.supervise.rms.api.riskalarm.RiskAlarm; @@ -40,25 +42,29 @@ public class RiskRecordService extends MybatisBaseService()); - RiskRecord riskRecord = new RiskRecord(); - BeanUtil.copyProperties(dto, riskRecord); - baseMapper.insert(riskRecord); + RiskRecord r=baseMapper.selectOne(new QueryWrapper<>()); + //baseMapper.delete(new QueryWrapper()); +// RiskRecord riskRecord = new RiskRecord(); +// BeanUtil.copyProperties(dto, riskRecord); + r.setDate(dto.getDate()); + baseMapper.updateById(r); return rb.success().setMsg("更新成功"); } /** * 定时查询推送情况 */ - @Scheduled(cron = "55 * * * * ?") + @Scheduled(cron = "57 * * * * ?") public void build() throws InterruptedException { //Thread.sleep(58000); System.out.println("查询推送情况"); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - String date=ft.format(new Date()); + Date end =new Date(); + String endDate=ft.format(end); RiskAlarm riskAlarm = new RiskAlarm(); - System.out.println(date); - RiskRecord riskRecord=baseMapper.selectOne(new QueryWrapper().like("date",date)); - if(null==riskRecord){ + Date start =DateUtil.offset(end, DateField.MINUTE,-3); + String startDate=ft.format(start); + Integer riskRecord=baseMapper.getCount(startDate,endDate); + if(riskRecord==0){ RiskIndicators riskIndicators = riskIndicatorsService.getOne(new QueryWrapper().eq("code", "030406")); riskAlarm.setIndicatorSid(riskIndicators.getSid()); riskAlarm.setIndicatorCode(riskIndicators.getCode());