diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/QuartzLogController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/QuartzLogController.java new file mode 100644 index 0000000..892fb37 --- /dev/null +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/QuartzLogController.java @@ -0,0 +1,42 @@ +package com.ruoyi.page.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.page.domain.QuartzLog; +import com.ruoyi.page.service.QuartzLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 定时任务日志表(quartz_log)表控制层 + * @author du + * @since 2024/6/6 9:16 + */ +@RestController +@RequestMapping("algorithms/quartzLog") +@Api(tags = "定时任务日志") +@Transactional(rollbackFor = Exception.class) +public class QuartzLogController extends BaseController { + + @Resource + private QuartzLogService quartzLogService; + + /** + * 分页条件查询所有数据 + * + * @param page 分页条件 + * @return 所有数据 + */ + @GetMapping + @ApiOperation(value = "分页条件查询定时任务日志", response = QuartzLog.class) + public AjaxResult page(Page page, QuartzLog quartzLog) { + return success(quartzLogService.page(page, quartzLog)); + } +} diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java index 191d3ff..0c28a76 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java @@ -50,8 +50,8 @@ public class Alarm extends BaseEntity private Long emergencyEventLevel; /** 报警时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date emergencyEventTime; /** 报警内容 */ diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java index 919d805..0f667df 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java @@ -1,9 +1,11 @@ package com.yingji.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -97,6 +99,8 @@ public class Fire implements Serializable { * 立案时间 */ @ApiModelProperty(value = "立案时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lasj; /** * 行政区划名称 diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/QuartzLog.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/QuartzLog.java new file mode 100644 index 0000000..7694ffd --- /dev/null +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/QuartzLog.java @@ -0,0 +1,54 @@ +package com.ruoyi.page.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * 定时任务日志表(quartz_log)表实体类 + * @author du + * @since 2024/6/6 9:21 + */ +@Data +@ApiModel("定时任务日志实体类") +@TableName(value = "quartz_log") +public class QuartzLog implements Serializable { + + private static final long serialVersionUID = -96682169109217319L; + + + /** + * id + */ + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 状态 + */ + @ApiModelProperty(value = "状态 1成功 2失败") + private Integer status; + + /** + * 接口 + */ + @ApiModelProperty(value = "接口 1.110 2.119 3.120") + private Integer interfaceName; +} diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java index b698fe4..c8a795c 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/AlarmMapper.java @@ -1,21 +1,21 @@ package com.ruoyi.page.mapper; +import java.util.List; import com.ruoyi.page.domain.Alarm; import com.ruoyi.page.domain.dto.request.AlarmFindRequest; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * 报警事件Mapper接口 - * + * * @author ruoyi * @date 2024-05-30 */ -public interface AlarmMapper { +public interface AlarmMapper +{ /** * 查询报警事件 - * + * * @param emergencyEventId 报警事件主键 * @return 报警事件 */ @@ -23,15 +23,15 @@ public interface AlarmMapper { /** * 查询报警事件列表 - * + * * @param req 报警事件 * @return 报警事件集合 */ - public List selectAlarmList(@Param("req") AlarmFindRequest req); + public List selectAlarmList(@Param("req")AlarmFindRequest req); /** * 新增报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @@ -39,7 +39,7 @@ public interface AlarmMapper { /** * 修改报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @@ -47,7 +47,7 @@ public interface AlarmMapper { /** * 删除报警事件 - * + * * @param emergencyEventId 报警事件主键 * @return 结果 */ @@ -55,7 +55,7 @@ public interface AlarmMapper { /** * 批量删除报警事件 - * + * * @param emergencyEventIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java index 631922a..2a6c39e 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/EventMapper.java @@ -8,14 +8,15 @@ import java.util.List; /** * 事故Mapper接口 - * + * * @author ruoyi * @date 2024-05-30 */ -public interface EventMapper { +public interface EventMapper +{ /** * 查询事故 - * + * * @param eventId 事故主键 * @return 事故 */ @@ -23,7 +24,7 @@ public interface EventMapper { /** * 查询事故列表 - * + * * @param event 事故 * @return 事故集合 */ @@ -31,7 +32,7 @@ public interface EventMapper { /** * 新增事故 - * + * * @param event 事故 * @return 结果 */ @@ -39,7 +40,7 @@ public interface EventMapper { /** * 修改事故 - * + * * @param event 事故 * @return 结果 */ @@ -47,7 +48,7 @@ public interface EventMapper { /** * 删除事故 - * + * * @param eventId 事故主键 * @return 结果 */ @@ -55,7 +56,7 @@ public interface EventMapper { /** * 批量删除事故 - * + * * @param eventIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/QuartzLogMapper.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/QuartzLogMapper.java new file mode 100644 index 0000000..44b2691 --- /dev/null +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/mapper/QuartzLogMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.page.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.page.domain.QuartzLog; +import org.apache.ibatis.annotations.Param; + +/** + * 定时任务日志表(quartz_log)表数据层 + * + * @author ruoyi + * @date 2024-05-30 + */ +public interface QuartzLogMapper extends BaseMapper +{ + + /** + * 分页 + * @param page + * @param quartzLog + * @return + */ + Page page(Page page, @Param("req") QuartzLog quartzLog); +} diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/QuartzLogService.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/QuartzLogService.java new file mode 100644 index 0000000..cb4503c --- /dev/null +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/QuartzLogService.java @@ -0,0 +1,24 @@ +package com.ruoyi.page.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.page.domain.Event; +import com.ruoyi.page.domain.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表业务层 + * @author du + * @since 2024/6/6 9:20 + */ +public interface QuartzLogService extends IService { + + + /** + * 分页 + * @param page + * @param quartzLog + * @return + */ + Page page(Page page,QuartzLog quartzLog); + +} diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java index 42fc880..0ca328b 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/AlarmServiceImpl.java @@ -1,91 +1,99 @@ package com.ruoyi.page.service.impl; +import java.util.List; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.page.domain.Alarm; import com.ruoyi.page.domain.dto.request.AlarmFindRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import com.ruoyi.page.mapper.AlarmMapper; +import com.ruoyi.page.domain.Alarm; import com.ruoyi.page.service.IAlarmService; -import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; /** * 报警事件Service业务层处理 - * + * * @author ruoyi * @date 2024-05-30 */ @Service -public class AlarmServiceImpl implements IAlarmService { +public class AlarmServiceImpl implements IAlarmService +{ @Resource private AlarmMapper alarmMapper; /** * 查询报警事件 - * + * * @param emergencyEventId 报警事件主键 * @return 报警事件 */ @Override - public Alarm selectAlarmByEmergencyEventId(Long emergencyEventId) { + public Alarm selectAlarmByEmergencyEventId(Long emergencyEventId) + { return alarmMapper.selectAlarmByEmergencyEventId(emergencyEventId); } /** * 查询报警事件列表 - * + * * @param req 报警事件 * @return 报警事件 */ @Override - public List selectAlarmList(AlarmFindRequest req) { + public List selectAlarmList(AlarmFindRequest req) + { return alarmMapper.selectAlarmList(req); } /** * 新增报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @Override - public int insertAlarm(Alarm alarm) { + public int insertAlarm(Alarm alarm) + { alarm.setCreateTime(DateUtils.getNowDate()); return alarmMapper.insertAlarm(alarm); } /** * 修改报警事件 - * + * * @param alarm 报警事件 * @return 结果 */ @Override - public int updateAlarm(Alarm alarm) { + public int updateAlarm(Alarm alarm) + { alarm.setUpdateTime(DateUtils.getNowDate()); return alarmMapper.updateAlarm(alarm); } /** * 批量删除报警事件 - * + * * @param emergencyEventIds 需要删除的报警事件主键 * @return 结果 */ @Override - public int deleteAlarmByEmergencyEventIds(Long[] emergencyEventIds) { + public int deleteAlarmByEmergencyEventIds(Long[] emergencyEventIds) + { return alarmMapper.deleteAlarmByEmergencyEventIds(emergencyEventIds); } /** * 删除报警事件信息 - * + * * @param emergencyEventId 报警事件主键 * @return 结果 */ @Override - public int deleteAlarmByEmergencyEventId(Long emergencyEventId) { + public int deleteAlarmByEmergencyEventId(Long emergencyEventId) + { return alarmMapper.deleteAlarmByEmergencyEventId(emergencyEventId); } } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java index 79bed2f..ab311ea 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/EventServiceImpl.java @@ -4,6 +4,7 @@ import com.ruoyi.page.domain.Event; import com.ruoyi.page.domain.dto.request.EventPageRequest; import com.ruoyi.page.mapper.EventMapper; import com.ruoyi.page.service.IEventService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -12,78 +13,85 @@ import java.util.List; /** * 事故Service业务层处理 - * + * * @author ruoyi * @date 2024-05-30 */ @Service -public class EventServiceImpl implements IEventService { +public class EventServiceImpl implements IEventService +{ @Resource private EventMapper eventMapper; /** * 查询事故 - * + * * @param eventId 事故主键 * @return 事故 */ @Override - public Event selectEventByEventId(String eventId) { + public Event selectEventByEventId(String eventId) + { return eventMapper.selectEventByEventId(eventId); } /** * 查询事故列表 - * + * * @param req 事故 * @return 事故 */ @Override - public List selectEventList(EventPageRequest req) { + public List selectEventList(EventPageRequest req) + { return eventMapper.selectEventList(req); } /** * 新增事故 - * + * * @param event 事故 * @return 结果 */ @Override - public int insertEvent(Event event) { + public int insertEvent(Event event) + { return eventMapper.insertEvent(event); } /** * 修改事故 - * + * * @param event 事故 * @return 结果 */ @Override - public int updateEvent(Event event) { + public int updateEvent(Event event) + { return eventMapper.updateEvent(event); } /** * 批量删除事故 - * + * * @param eventIds 需要删除的事故主键 * @return 结果 */ @Override - public int deleteEventByEventIds(String[] eventIds) { + public int deleteEventByEventIds(String[] eventIds) + { return eventMapper.deleteEventByEventIds(eventIds); } /** * 删除事故信息 - * + * * @param eventId 事故主键 * @return 结果 */ @Override - public int deleteEventByEventId(String eventId) { + public int deleteEventByEventId(String eventId) + { return eventMapper.deleteEventByEventId(eventId); } } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/QuartzLogServiceImpl.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/QuartzLogServiceImpl.java new file mode 100644 index 0000000..fef92bd --- /dev/null +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/QuartzLogServiceImpl.java @@ -0,0 +1,27 @@ +package com.ruoyi.page.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.page.domain.QuartzLog; +import com.ruoyi.page.mapper.QuartzLogMapper; +import com.ruoyi.page.service.QuartzLogService; +import org.springframework.stereotype.Service; + +/** + * 定时任务日志表(quartz_log)表业务处理层 + * @author du + * @since 2024/6/6 9:40 + */ +@Service +public class QuartzLogServiceImpl extends ServiceImpl implements QuartzLogService { + /** + * 分页 + * @param page + * @param quartzLog + * @return + */ + @Override + public Page page(Page page, QuartzLog quartzLog) { + return baseMapper.page(page,quartzLog); + } +} diff --git a/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index 9fba706..f712180 100644 --- a/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -40,7 +40,7 @@ public class MybatisPlusConfig // 设置数据库类型为mysql paginationInnerInterceptor.setDbType(DbType.MYSQL); // 设置最大单页限制数量,默认 500 条,-1 不受限制 - paginationInnerInterceptor.setMaxLimit(1000L); + paginationInnerInterceptor.setMaxLimit(-1L); return paginationInnerInterceptor; } diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml index 2ea3bf9..b6e57da 100644 --- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml +++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml @@ -112,6 +112,7 @@ AND alarm_unit_telephone LIKE CONCAT('%', #{event.alarmUnitTelephone}, '%') + order by event_date_time desc diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/QuartzLogMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/QuartzLogMapper.xml new file mode 100644 index 0000000..2b668a6 --- /dev/null +++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/QuartzLogMapper.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/alarm/src/main/java/com/yingji/entity/QuartzLog.java b/alarm/src/main/java/com/yingji/entity/QuartzLog.java new file mode 100644 index 0000000..51b6f69 --- /dev/null +++ b/alarm/src/main/java/com/yingji/entity/QuartzLog.java @@ -0,0 +1,55 @@ +package com.yingji.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 定时任务日志表(quartz_log)表实体类 + * @author du + * @since 2024/6/6 9:21 + */ +@Data +@ApiModel("定时任务日志实体类") +@TableName(value = "quartz_log") +public class QuartzLog implements Serializable { + + private static final long serialVersionUID = -96682169109217319L; + + + /** + * id + */ + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** + * 状态 + */ + @ApiModelProperty(value = "状态 1成功 2失败") + private Integer status; + + /** + * 接口 + */ + @ApiModelProperty(value = "接口 1.110 2.119 3.120") + private Integer interfaceName; +} diff --git a/alarm/src/main/java/com/yingji/mapper/QuartzLogMapper.java b/alarm/src/main/java/com/yingji/mapper/QuartzLogMapper.java new file mode 100644 index 0000000..8706539 --- /dev/null +++ b/alarm/src/main/java/com/yingji/mapper/QuartzLogMapper.java @@ -0,0 +1,14 @@ +package com.yingji.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yingji.entity.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表数据层 + * + * @author ruoyi + * @date 2024-05-30 + */ +public interface QuartzLogMapper extends BaseMapper +{ +} diff --git a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java index c5c959f..f2027e2 100644 --- a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java +++ b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java @@ -3,12 +3,15 @@ package com.yingji.quartz; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import com.yingji.entity.Alarm; +import com.yingji.entity.QuartzLog; import com.yingji.entity.dto.request.AlarmRequest; import com.yingji.service.AlarmService; +import com.yingji.service.QuartzLogService; import com.yingji.service.SourceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,11 +22,7 @@ import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; /** * 110数据保存定时任务 @@ -42,6 +41,9 @@ public class AlarmQuartz { @Resource private SourceService sourceService; + @Resource + private QuartzLogService quartzLogService; + /** * 保存所有数据 */ @@ -50,6 +52,9 @@ public class AlarmQuartz { public void savaData() { // 获取token String token = alarmService.getToken(); + QuartzLog quartzLog = new QuartzLog(); + quartzLog.setInterfaceName(1); + quartzLog.setCreateTime(LocalDateTime.now()); if (StrUtil.isNotEmpty(token)) { // 查询所有id List idList = findId(token); @@ -59,7 +64,11 @@ public class AlarmQuartz { if (CollectionUtil.isNotEmpty(idList)) { emergencyAlgorithm(); } + quartzLog.setStatus(1); + quartzLogService.save(quartzLog); } else { + quartzLog.setStatus(2); + quartzLogService.save(quartzLog); log.error("============110算法接口获取token失败============="); } } diff --git a/alarm/src/main/java/com/yingji/service/QuartzLogService.java b/alarm/src/main/java/com/yingji/service/QuartzLogService.java new file mode 100644 index 0000000..d70b38b --- /dev/null +++ b/alarm/src/main/java/com/yingji/service/QuartzLogService.java @@ -0,0 +1,12 @@ +package com.yingji.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.yingji.entity.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表业务层 + * @author du + * @since 2024/6/6 9:20 + */ +public interface QuartzLogService extends IService { +} diff --git a/alarm/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java b/alarm/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java new file mode 100644 index 0000000..7b4d558 --- /dev/null +++ b/alarm/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java @@ -0,0 +1,17 @@ +package com.yingji.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yingji.entity.QuartzLog; +import com.yingji.mapper.QuartzLogMapper; +import com.yingji.service.QuartzLogService; +import org.springframework.stereotype.Service; + +/** + * 定时任务日志表(quartz_log)表业务处理层 + * @author du + * @since 2024/6/6 9:40 + */ +@Service +public class QuartzLogServiceImpl extends ServiceImpl implements QuartzLogService { + +} diff --git a/fire/src/main/java/com/yingji/entity/QuartzLog.java b/fire/src/main/java/com/yingji/entity/QuartzLog.java new file mode 100644 index 0000000..d9db61e --- /dev/null +++ b/fire/src/main/java/com/yingji/entity/QuartzLog.java @@ -0,0 +1,54 @@ +package com.yingji.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 定时任务日志表(quartz_log)表实体类 + * @author du + * @since 2024/6/6 9:21 + */ +@Data +@ApiModel("定时任务日志实体类") +@TableName(value = "quartz_log") +public class QuartzLog implements Serializable { + + private static final long serialVersionUID = -96682169109217319L; + + + /** + * id + */ + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** + * 状态 + */ + @ApiModelProperty(value = "状态 1成功 2失败") + private Integer status; + + /** + * 接口 + */ + @ApiModelProperty(value = "接口 1.110 2.119 3.120") + private Integer interfaceName; +} diff --git a/fire/src/main/java/com/yingji/mapper/QuartzLogMapper.java b/fire/src/main/java/com/yingji/mapper/QuartzLogMapper.java new file mode 100644 index 0000000..8706539 --- /dev/null +++ b/fire/src/main/java/com/yingji/mapper/QuartzLogMapper.java @@ -0,0 +1,14 @@ +package com.yingji.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yingji.entity.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表数据层 + * + * @author ruoyi + * @date 2024-05-30 + */ +public interface QuartzLogMapper extends BaseMapper +{ +} diff --git a/fire/src/main/java/com/yingji/quartz/FireQuartz.java b/fire/src/main/java/com/yingji/quartz/FireQuartz.java index aeac211..49b6bd9 100644 --- a/fire/src/main/java/com/yingji/quartz/FireQuartz.java +++ b/fire/src/main/java/com/yingji/quartz/FireQuartz.java @@ -3,7 +3,9 @@ package com.yingji.quartz; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.yingji.entity.Fire; +import com.yingji.entity.QuartzLog; import com.yingji.service.FireService; +import com.yingji.service.QuartzLogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; @@ -28,6 +30,9 @@ public class FireQuartz { @Resource private FireService fireService; + + @Resource + private QuartzLogService quartzLogService; /** * 保存所有数据 */ @@ -37,6 +42,9 @@ public class FireQuartz { log.info("119接口开始" + LocalDateTime.now()); // 获取token String token = fireService.getToken(); + QuartzLog quartzLog = new QuartzLog(); + quartzLog.setInterfaceName(2); + quartzLog.setCreateTime(LocalDateTime.now()); if (StrUtil.isNotEmpty(token)) { // 根据id查询数据保存 List list = fireService.findDataList(token); @@ -44,8 +52,12 @@ public class FireQuartz { if (CollectionUtil.isNotEmpty(list)) { fireService.saveAll(list); } + quartzLog.setStatus(1); + quartzLogService.save(quartzLog); log.info("119接口结束" + LocalDateTime.now()); } else { + quartzLog.setStatus(2); + quartzLogService.save(quartzLog); log.error("============119算法接口获取token失败119接口结束============="); } } diff --git a/fire/src/main/java/com/yingji/service/QuartzLogService.java b/fire/src/main/java/com/yingji/service/QuartzLogService.java new file mode 100644 index 0000000..d70b38b --- /dev/null +++ b/fire/src/main/java/com/yingji/service/QuartzLogService.java @@ -0,0 +1,12 @@ +package com.yingji.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.yingji.entity.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表业务层 + * @author du + * @since 2024/6/6 9:20 + */ +public interface QuartzLogService extends IService { +} diff --git a/fire/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java b/fire/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java new file mode 100644 index 0000000..7b4d558 --- /dev/null +++ b/fire/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java @@ -0,0 +1,17 @@ +package com.yingji.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yingji.entity.QuartzLog; +import com.yingji.mapper.QuartzLogMapper; +import com.yingji.service.QuartzLogService; +import org.springframework.stereotype.Service; + +/** + * 定时任务日志表(quartz_log)表业务处理层 + * @author du + * @since 2024/6/6 9:40 + */ +@Service +public class QuartzLogServiceImpl extends ServiceImpl implements QuartzLogService { + +} diff --git a/rescue/src/main/java/com/yingji/entity/QuartzLog.java b/rescue/src/main/java/com/yingji/entity/QuartzLog.java new file mode 100644 index 0000000..3b78354 --- /dev/null +++ b/rescue/src/main/java/com/yingji/entity/QuartzLog.java @@ -0,0 +1,54 @@ +package com.yingji.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 定时任务日志表(quartz_log)表实体类 + * @author du + * @since 2024/6/6 9:21 + */ +@Data +@ApiModel("定时任务日志实体类") +@TableName(value = "quartz_log") +public class QuartzLog implements Serializable { + + private static final long serialVersionUID = -96682169109217319L; + + + /** + * id + */ + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** + * 状态 + */ + @ApiModelProperty(value = "状态 1成功 2失败") + private Integer status; + + /** + * 接口 + */ + @ApiModelProperty(value = "接口 1.110 2.119 3.120 ") + private Integer interfaceName; +} diff --git a/rescue/src/main/java/com/yingji/mapper/QuartzLogMapper.java b/rescue/src/main/java/com/yingji/mapper/QuartzLogMapper.java new file mode 100644 index 0000000..8706539 --- /dev/null +++ b/rescue/src/main/java/com/yingji/mapper/QuartzLogMapper.java @@ -0,0 +1,14 @@ +package com.yingji.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yingji.entity.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表数据层 + * + * @author ruoyi + * @date 2024-05-30 + */ +public interface QuartzLogMapper extends BaseMapper +{ +} diff --git a/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java b/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java index 5cf3d3d..5a26ada 100644 --- a/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java +++ b/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java @@ -1,7 +1,9 @@ package com.yingji.quartz; import cn.hutool.core.util.StrUtil; +import com.yingji.entity.QuartzLog; import com.yingji.service.AccidentService; +import com.yingji.service.QuartzLogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; @@ -10,6 +12,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDateTime; /** * 120定时任务保存数据 @@ -26,14 +29,23 @@ public class AccidentQuartz { @Resource private AccidentService accidentService; + @Resource + private QuartzLogService quartzLogService; @Async @Scheduled(cron = "*/10 * * * * ? ") public void savaData() { String accessToken = accidentService.getAuthorizeToken(); + QuartzLog quartzLog = new QuartzLog(); + quartzLog.setInterfaceName(3); + quartzLog.setCreateTime(LocalDateTime.now()); if (StrUtil.isNotEmpty(accessToken)) { accidentService.getAccidentUrl(accessToken); + quartzLog.setStatus(1); + quartzLogService.save(quartzLog); log.info("=================120定时任务结束==============="); } else { + quartzLog.setStatus(2); + quartzLogService.save(quartzLog); log.info("=================120定时任务获取token失败==============="); } } diff --git a/rescue/src/main/java/com/yingji/service/QuartzLogService.java b/rescue/src/main/java/com/yingji/service/QuartzLogService.java new file mode 100644 index 0000000..d70b38b --- /dev/null +++ b/rescue/src/main/java/com/yingji/service/QuartzLogService.java @@ -0,0 +1,12 @@ +package com.yingji.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.yingji.entity.QuartzLog; + +/** + * 定时任务日志表(quartz_log)表业务层 + * @author du + * @since 2024/6/6 9:20 + */ +public interface QuartzLogService extends IService { +} diff --git a/rescue/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java b/rescue/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java new file mode 100644 index 0000000..7b4d558 --- /dev/null +++ b/rescue/src/main/java/com/yingji/service/impl/QuartzLogServiceImpl.java @@ -0,0 +1,17 @@ +package com.yingji.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yingji.entity.QuartzLog; +import com.yingji.mapper.QuartzLogMapper; +import com.yingji.service.QuartzLogService; +import org.springframework.stereotype.Service; + +/** + * 定时任务日志表(quartz_log)表业务处理层 + * @author du + * @since 2024/6/6 9:40 + */ +@Service +public class QuartzLogServiceImpl extends ServiceImpl implements QuartzLogService { + +}