diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index f59eec2..c53af96 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -45,6 +45,15 @@ return new ResultStatus(StrategyAlarmConst.DIST_LJLXBJ_CODE); } + //-----------------------------路段打卡时间记录------------------------------------------ + //设定该路段最早时间 + if (data.getRouteData().getStartTime() == null || data.getRouteData().getStartTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) > 0) { + data.getRouteData().setStartTime(data.getPosData().getCarPositionDto().getUpTime()); + } + //设定该路段最晚打卡时间 + if (data.getRouteData().getEndTime() == null || data.getRouteData().getEndTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) < 0) { + data.getRouteData().setEndTime(data.getPosData().getCarPositionDto().getUpTime()); + } //如果为正常则返回所在线段点 return new ResultStatus(StrategyAlarmConst.DIST_BJZT_NOALARM, nearestIndex); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index f59eec2..c53af96 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -45,6 +45,15 @@ return new ResultStatus(StrategyAlarmConst.DIST_LJLXBJ_CODE); } + //-----------------------------路段打卡时间记录------------------------------------------ + //设定该路段最早时间 + if (data.getRouteData().getStartTime() == null || data.getRouteData().getStartTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) > 0) { + data.getRouteData().setStartTime(data.getPosData().getCarPositionDto().getUpTime()); + } + //设定该路段最晚打卡时间 + if (data.getRouteData().getEndTime() == null || data.getRouteData().getEndTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) < 0) { + data.getRouteData().setEndTime(data.getPosData().getCarPositionDto().getUpTime()); + } //如果为正常则返回所在线段点 return new ResultStatus(StrategyAlarmConst.DIST_BJZT_NOALARM, nearestIndex); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java index b60cbe7..0d854c7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.modular.system.alarm.strategy.base.BaseAlarmStrategy; import com.casic.missiles.modular.system.alarm.strategy.base.ResultStatus; import com.casic.missiles.modular.system.alarm.strategy.factory.AlarmStrategyFactory; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import com.casic.missiles.modular.system.service.ISanitationCarService; @@ -105,16 +106,18 @@ //获取当前时段信息 Map map = getStartAndEndTime(times); Long carId = busCarInfo.getId(); -// if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(106))){ -// carId = 5L; -// map.put("start","2021-05-26 10:15:00"); -// map.put("end","2021-05-26 12:00:00"); -// } + if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) { + carId = 5L; + map.put("start", "2021-05-26 10:15:00"); + map.put("end", "2021-05-26 12:00:00"); + } //获取规定时间内 车辆定位数据 List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); - sets.addAll(context.execStrategy(alarmProcessDTO)); - System.out.println("车辆定位点信息:" + sets); + Set res = context.execStrategy(alarmProcessDTO); + sets.addAll(res); + //记录作业时间,并清空route + processJobLog(sets, alarmProcessDTO, currTime); } //作业记录入库 // processJobResult(sets, alarmProcessDTO, currTime); @@ -126,6 +129,22 @@ } } + private void processJobLog(Set sets, AlarmProcessDTO alarmProcessDTO, String currTime) { + //保存作业记录时间 + if (!ToolUtil.isOneEmpty(alarmProcessDTO.getRouteData().getStartTime(), alarmProcessDTO.getRouteData().getEndTime())) { + JobRecord jobRecord = new JobRecord(); + jobRecord.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + jobRecord.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + + jobRecord.setStartTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getStartTime())); + jobRecord.setEndTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getEndTime())); + + jobRecord.setCreateTime(new Date()); + jobRecord.setUpdateTime(jobRecord.getCreateTime()); + jobSupportService.saveOrUpdateJobRecordByTime(jobRecord); + } + } + /** * 车辆作业统计数据入库 * diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index f59eec2..c53af96 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -45,6 +45,15 @@ return new ResultStatus(StrategyAlarmConst.DIST_LJLXBJ_CODE); } + //-----------------------------路段打卡时间记录------------------------------------------ + //设定该路段最早时间 + if (data.getRouteData().getStartTime() == null || data.getRouteData().getStartTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) > 0) { + data.getRouteData().setStartTime(data.getPosData().getCarPositionDto().getUpTime()); + } + //设定该路段最晚打卡时间 + if (data.getRouteData().getEndTime() == null || data.getRouteData().getEndTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) < 0) { + data.getRouteData().setEndTime(data.getPosData().getCarPositionDto().getUpTime()); + } //如果为正常则返回所在线段点 return new ResultStatus(StrategyAlarmConst.DIST_BJZT_NOALARM, nearestIndex); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java index b60cbe7..0d854c7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.modular.system.alarm.strategy.base.BaseAlarmStrategy; import com.casic.missiles.modular.system.alarm.strategy.base.ResultStatus; import com.casic.missiles.modular.system.alarm.strategy.factory.AlarmStrategyFactory; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import com.casic.missiles.modular.system.service.ISanitationCarService; @@ -105,16 +106,18 @@ //获取当前时段信息 Map map = getStartAndEndTime(times); Long carId = busCarInfo.getId(); -// if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(106))){ -// carId = 5L; -// map.put("start","2021-05-26 10:15:00"); -// map.put("end","2021-05-26 12:00:00"); -// } + if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) { + carId = 5L; + map.put("start", "2021-05-26 10:15:00"); + map.put("end", "2021-05-26 12:00:00"); + } //获取规定时间内 车辆定位数据 List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); - sets.addAll(context.execStrategy(alarmProcessDTO)); - System.out.println("车辆定位点信息:" + sets); + Set res = context.execStrategy(alarmProcessDTO); + sets.addAll(res); + //记录作业时间,并清空route + processJobLog(sets, alarmProcessDTO, currTime); } //作业记录入库 // processJobResult(sets, alarmProcessDTO, currTime); @@ -126,6 +129,22 @@ } } + private void processJobLog(Set sets, AlarmProcessDTO alarmProcessDTO, String currTime) { + //保存作业记录时间 + if (!ToolUtil.isOneEmpty(alarmProcessDTO.getRouteData().getStartTime(), alarmProcessDTO.getRouteData().getEndTime())) { + JobRecord jobRecord = new JobRecord(); + jobRecord.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + jobRecord.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + + jobRecord.setStartTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getStartTime())); + jobRecord.setEndTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getEndTime())); + + jobRecord.setCreateTime(new Date()); + jobRecord.setUpdateTime(jobRecord.getCreateTime()); + jobSupportService.saveOrUpdateJobRecordByTime(jobRecord); + } + } + /** * 车辆作业统计数据入库 * diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java index 5e62176..45dfaef 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.job.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.job.service.IJobRecordService; import com.casic.missiles.modular.job.service.IJobStatisticsDayService; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,8 @@ @Autowired private IJobStatisticsDayService jobStatisticsDayService; + @Autowired + private IJobRecordService recordService; @Override public boolean save(JobStatisticsDay entity) { @@ -42,4 +46,16 @@ } } + + @Override + public void saveOrUpdateJobRecordByTime(JobRecord record) { + EntityWrapper query = new EntityWrapper(); + query.eq("CAR_ID", record.getCarId()); + query.eq("ROUTE_ID", record.getRouteId()); + query.eq("START_TIME", record.getStartTime()); + query.eq("END_TIME", record.getStartTime()); + if (recordService.selectCount(query) == 0) { + recordService.insert(record); + } + } } diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index f59eec2..c53af96 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -45,6 +45,15 @@ return new ResultStatus(StrategyAlarmConst.DIST_LJLXBJ_CODE); } + //-----------------------------路段打卡时间记录------------------------------------------ + //设定该路段最早时间 + if (data.getRouteData().getStartTime() == null || data.getRouteData().getStartTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) > 0) { + data.getRouteData().setStartTime(data.getPosData().getCarPositionDto().getUpTime()); + } + //设定该路段最晚打卡时间 + if (data.getRouteData().getEndTime() == null || data.getRouteData().getEndTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) < 0) { + data.getRouteData().setEndTime(data.getPosData().getCarPositionDto().getUpTime()); + } //如果为正常则返回所在线段点 return new ResultStatus(StrategyAlarmConst.DIST_BJZT_NOALARM, nearestIndex); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java index b60cbe7..0d854c7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.modular.system.alarm.strategy.base.BaseAlarmStrategy; import com.casic.missiles.modular.system.alarm.strategy.base.ResultStatus; import com.casic.missiles.modular.system.alarm.strategy.factory.AlarmStrategyFactory; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import com.casic.missiles.modular.system.service.ISanitationCarService; @@ -105,16 +106,18 @@ //获取当前时段信息 Map map = getStartAndEndTime(times); Long carId = busCarInfo.getId(); -// if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(106))){ -// carId = 5L; -// map.put("start","2021-05-26 10:15:00"); -// map.put("end","2021-05-26 12:00:00"); -// } + if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) { + carId = 5L; + map.put("start", "2021-05-26 10:15:00"); + map.put("end", "2021-05-26 12:00:00"); + } //获取规定时间内 车辆定位数据 List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); - sets.addAll(context.execStrategy(alarmProcessDTO)); - System.out.println("车辆定位点信息:" + sets); + Set res = context.execStrategy(alarmProcessDTO); + sets.addAll(res); + //记录作业时间,并清空route + processJobLog(sets, alarmProcessDTO, currTime); } //作业记录入库 // processJobResult(sets, alarmProcessDTO, currTime); @@ -126,6 +129,22 @@ } } + private void processJobLog(Set sets, AlarmProcessDTO alarmProcessDTO, String currTime) { + //保存作业记录时间 + if (!ToolUtil.isOneEmpty(alarmProcessDTO.getRouteData().getStartTime(), alarmProcessDTO.getRouteData().getEndTime())) { + JobRecord jobRecord = new JobRecord(); + jobRecord.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + jobRecord.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + + jobRecord.setStartTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getStartTime())); + jobRecord.setEndTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getEndTime())); + + jobRecord.setCreateTime(new Date()); + jobRecord.setUpdateTime(jobRecord.getCreateTime()); + jobSupportService.saveOrUpdateJobRecordByTime(jobRecord); + } + } + /** * 车辆作业统计数据入库 * diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java index 5e62176..45dfaef 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.job.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.job.service.IJobRecordService; import com.casic.missiles.modular.job.service.IJobStatisticsDayService; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,8 @@ @Autowired private IJobStatisticsDayService jobStatisticsDayService; + @Autowired + private IJobRecordService recordService; @Override public boolean save(JobStatisticsDay entity) { @@ -42,4 +46,16 @@ } } + + @Override + public void saveOrUpdateJobRecordByTime(JobRecord record) { + EntityWrapper query = new EntityWrapper(); + query.eq("CAR_ID", record.getCarId()); + query.eq("ROUTE_ID", record.getRouteId()); + query.eq("START_TIME", record.getStartTime()); + query.eq("END_TIME", record.getStartTime()); + if (recordService.selectCount(query) == 0) { + recordService.insert(record); + } + } } diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java deleted file mode 100644 index 10124a7..0000000 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import java.io.Serializable; - -import java.util.Date; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 车辆作业记录表 - *

- * - * @author lwh123 - * @since 2021-01-07 - */ -@Data -@TableName("casic_sanitation.dcms_car_job_record") -public class JobRecord extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @TableId(value = "ID",type = IdType.ID_WORKER) - private Long id; - /** - * 车辆ID - */ - @TableField("CAR_ID") - private Long carId; - /** - * 路线ID - */ - @TableField("ROUTE_ID") - private Long routeId; - /** - * 开始时间 - */ - @TableField("START_TIME") - private Date startTime; - /** - * 结束时间 - */ - @TableField("END_TIME") - private Date endTime; - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private Date createTime; - /** - * 修改时间 - */ - @TableField("UPDATE_TIME") - private Date updateTime; - - @Override - protected Serializable pkVal() { - return this.id; - } - - @Override - public String toString() { - return "JobRecord{" + - "id=" + id + - ", carId=" + carId + - ", routeId=" + routeId + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - "}"; - } -} diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index f59eec2..c53af96 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -45,6 +45,15 @@ return new ResultStatus(StrategyAlarmConst.DIST_LJLXBJ_CODE); } + //-----------------------------路段打卡时间记录------------------------------------------ + //设定该路段最早时间 + if (data.getRouteData().getStartTime() == null || data.getRouteData().getStartTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) > 0) { + data.getRouteData().setStartTime(data.getPosData().getCarPositionDto().getUpTime()); + } + //设定该路段最晚打卡时间 + if (data.getRouteData().getEndTime() == null || data.getRouteData().getEndTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) < 0) { + data.getRouteData().setEndTime(data.getPosData().getCarPositionDto().getUpTime()); + } //如果为正常则返回所在线段点 return new ResultStatus(StrategyAlarmConst.DIST_BJZT_NOALARM, nearestIndex); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java index b60cbe7..0d854c7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.modular.system.alarm.strategy.base.BaseAlarmStrategy; import com.casic.missiles.modular.system.alarm.strategy.base.ResultStatus; import com.casic.missiles.modular.system.alarm.strategy.factory.AlarmStrategyFactory; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import com.casic.missiles.modular.system.service.ISanitationCarService; @@ -105,16 +106,18 @@ //获取当前时段信息 Map map = getStartAndEndTime(times); Long carId = busCarInfo.getId(); -// if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(106))){ -// carId = 5L; -// map.put("start","2021-05-26 10:15:00"); -// map.put("end","2021-05-26 12:00:00"); -// } + if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) { + carId = 5L; + map.put("start", "2021-05-26 10:15:00"); + map.put("end", "2021-05-26 12:00:00"); + } //获取规定时间内 车辆定位数据 List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); - sets.addAll(context.execStrategy(alarmProcessDTO)); - System.out.println("车辆定位点信息:" + sets); + Set res = context.execStrategy(alarmProcessDTO); + sets.addAll(res); + //记录作业时间,并清空route + processJobLog(sets, alarmProcessDTO, currTime); } //作业记录入库 // processJobResult(sets, alarmProcessDTO, currTime); @@ -126,6 +129,22 @@ } } + private void processJobLog(Set sets, AlarmProcessDTO alarmProcessDTO, String currTime) { + //保存作业记录时间 + if (!ToolUtil.isOneEmpty(alarmProcessDTO.getRouteData().getStartTime(), alarmProcessDTO.getRouteData().getEndTime())) { + JobRecord jobRecord = new JobRecord(); + jobRecord.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + jobRecord.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + + jobRecord.setStartTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getStartTime())); + jobRecord.setEndTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getEndTime())); + + jobRecord.setCreateTime(new Date()); + jobRecord.setUpdateTime(jobRecord.getCreateTime()); + jobSupportService.saveOrUpdateJobRecordByTime(jobRecord); + } + } + /** * 车辆作业统计数据入库 * diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java index 5e62176..45dfaef 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.job.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.job.service.IJobRecordService; import com.casic.missiles.modular.job.service.IJobStatisticsDayService; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,8 @@ @Autowired private IJobStatisticsDayService jobStatisticsDayService; + @Autowired + private IJobRecordService recordService; @Override public boolean save(JobStatisticsDay entity) { @@ -42,4 +46,16 @@ } } + + @Override + public void saveOrUpdateJobRecordByTime(JobRecord record) { + EntityWrapper query = new EntityWrapper(); + query.eq("CAR_ID", record.getCarId()); + query.eq("ROUTE_ID", record.getRouteId()); + query.eq("START_TIME", record.getStartTime()); + query.eq("END_TIME", record.getStartTime()); + if (recordService.selectCount(query) == 0) { + recordService.insert(record); + } + } } diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java deleted file mode 100644 index 10124a7..0000000 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import java.io.Serializable; - -import java.util.Date; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 车辆作业记录表 - *

- * - * @author lwh123 - * @since 2021-01-07 - */ -@Data -@TableName("casic_sanitation.dcms_car_job_record") -public class JobRecord extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @TableId(value = "ID",type = IdType.ID_WORKER) - private Long id; - /** - * 车辆ID - */ - @TableField("CAR_ID") - private Long carId; - /** - * 路线ID - */ - @TableField("ROUTE_ID") - private Long routeId; - /** - * 开始时间 - */ - @TableField("START_TIME") - private Date startTime; - /** - * 结束时间 - */ - @TableField("END_TIME") - private Date endTime; - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private Date createTime; - /** - * 修改时间 - */ - @TableField("UPDATE_TIME") - private Date updateTime; - - @Override - protected Serializable pkVal() { - return this.id; - } - - @Override - public String toString() { - return "JobRecord{" + - "id=" + id + - ", carId=" + carId + - ", routeId=" + routeId + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - "}"; - } -} diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java b/casic-service-support/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java new file mode 100644 index 0000000..10124a7 --- /dev/null +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java @@ -0,0 +1,82 @@ +package com.casic.missiles.modular.system.model; + +import java.io.Serializable; + +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 车辆作业记录表 + *

+ * + * @author lwh123 + * @since 2021-01-07 + */ +@Data +@TableName("casic_sanitation.dcms_car_job_record") +public class JobRecord extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "ID",type = IdType.ID_WORKER) + private Long id; + /** + * 车辆ID + */ + @TableField("CAR_ID") + private Long carId; + /** + * 路线ID + */ + @TableField("ROUTE_ID") + private Long routeId; + /** + * 开始时间 + */ + @TableField("START_TIME") + private Date startTime; + /** + * 结束时间 + */ + @TableField("END_TIME") + private Date endTime; + /** + * 创建时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 修改时间 + */ + @TableField("UPDATE_TIME") + private Date updateTime; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "JobRecord{" + + "id=" + id + + ", carId=" + carId + + ", routeId=" + routeId + + ", startTime=" + startTime + + ", endTime=" + endTime + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + "}"; + } +} diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java index 28a4ec9..0ef3d71 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/dto/RouteInfoDTO.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.route.model.BusRoutePath; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -19,6 +20,15 @@ * 车辆数据 */ private BusRouteInfo routeInfo; + + /** + * 该路段最早时间点 + */ + private String startTime; + /** + * 该路段最后时间点 + */ + private String endTime; /** * 车辆线段数据 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java index f59eec2..c53af96 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/DeviateRotueAlarmStrategy.java @@ -45,6 +45,15 @@ return new ResultStatus(StrategyAlarmConst.DIST_LJLXBJ_CODE); } + //-----------------------------路段打卡时间记录------------------------------------------ + //设定该路段最早时间 + if (data.getRouteData().getStartTime() == null || data.getRouteData().getStartTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) > 0) { + data.getRouteData().setStartTime(data.getPosData().getCarPositionDto().getUpTime()); + } + //设定该路段最晚打卡时间 + if (data.getRouteData().getEndTime() == null || data.getRouteData().getEndTime().compareTo(data.getPosData().getCarPositionDto().getUpTime()) < 0) { + data.getRouteData().setEndTime(data.getPosData().getCarPositionDto().getUpTime()); + } //如果为正常则返回所在线段点 return new ResultStatus(StrategyAlarmConst.DIST_BJZT_NOALARM, nearestIndex); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java index b60cbe7..0d854c7 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.modular.system.alarm.strategy.base.BaseAlarmStrategy; import com.casic.missiles.modular.system.alarm.strategy.base.ResultStatus; import com.casic.missiles.modular.system.alarm.strategy.factory.AlarmStrategyFactory; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import com.casic.missiles.modular.system.service.ISanitationCarService; @@ -105,16 +106,18 @@ //获取当前时段信息 Map map = getStartAndEndTime(times); Long carId = busCarInfo.getId(); -// if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(106))){ -// carId = 5L; -// map.put("start","2021-05-26 10:15:00"); -// map.put("end","2021-05-26 12:00:00"); -// } + if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) { + carId = 5L; + map.put("start", "2021-05-26 10:15:00"); + map.put("end", "2021-05-26 12:00:00"); + } //获取规定时间内 车辆定位数据 List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); - sets.addAll(context.execStrategy(alarmProcessDTO)); - System.out.println("车辆定位点信息:" + sets); + Set res = context.execStrategy(alarmProcessDTO); + sets.addAll(res); + //记录作业时间,并清空route + processJobLog(sets, alarmProcessDTO, currTime); } //作业记录入库 // processJobResult(sets, alarmProcessDTO, currTime); @@ -126,6 +129,22 @@ } } + private void processJobLog(Set sets, AlarmProcessDTO alarmProcessDTO, String currTime) { + //保存作业记录时间 + if (!ToolUtil.isOneEmpty(alarmProcessDTO.getRouteData().getStartTime(), alarmProcessDTO.getRouteData().getEndTime())) { + JobRecord jobRecord = new JobRecord(); + jobRecord.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + jobRecord.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + + jobRecord.setStartTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getStartTime())); + jobRecord.setEndTime(DateUtil.parseTime(alarmProcessDTO.getRouteData().getEndTime())); + + jobRecord.setCreateTime(new Date()); + jobRecord.setUpdateTime(jobRecord.getCreateTime()); + jobSupportService.saveOrUpdateJobRecordByTime(jobRecord); + } + } + /** * 车辆作业统计数据入库 * diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java index 5e62176..45dfaef 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.job.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.job.service.IJobRecordService; import com.casic.missiles.modular.job.service.IJobStatisticsDayService; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,8 @@ @Autowired private IJobStatisticsDayService jobStatisticsDayService; + @Autowired + private IJobRecordService recordService; @Override public boolean save(JobStatisticsDay entity) { @@ -42,4 +46,16 @@ } } + + @Override + public void saveOrUpdateJobRecordByTime(JobRecord record) { + EntityWrapper query = new EntityWrapper(); + query.eq("CAR_ID", record.getCarId()); + query.eq("ROUTE_ID", record.getRouteId()); + query.eq("START_TIME", record.getStartTime()); + query.eq("END_TIME", record.getStartTime()); + if (recordService.selectCount(query) == 0) { + recordService.insert(record); + } + } } diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java deleted file mode 100644 index 10124a7..0000000 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.missiles.modular.system.model; - -import java.io.Serializable; - -import java.util.Date; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 车辆作业记录表 - *

- * - * @author lwh123 - * @since 2021-01-07 - */ -@Data -@TableName("casic_sanitation.dcms_car_job_record") -public class JobRecord extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @TableId(value = "ID",type = IdType.ID_WORKER) - private Long id; - /** - * 车辆ID - */ - @TableField("CAR_ID") - private Long carId; - /** - * 路线ID - */ - @TableField("ROUTE_ID") - private Long routeId; - /** - * 开始时间 - */ - @TableField("START_TIME") - private Date startTime; - /** - * 结束时间 - */ - @TableField("END_TIME") - private Date endTime; - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private Date createTime; - /** - * 修改时间 - */ - @TableField("UPDATE_TIME") - private Date updateTime; - - @Override - protected Serializable pkVal() { - return this.id; - } - - @Override - public String toString() { - return "JobRecord{" + - "id=" + id + - ", carId=" + carId + - ", routeId=" + routeId + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - "}"; - } -} diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java b/casic-service-support/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java new file mode 100644 index 0000000..10124a7 --- /dev/null +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/system/model/JobRecord.java @@ -0,0 +1,82 @@ +package com.casic.missiles.modular.system.model; + +import java.io.Serializable; + +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 车辆作业记录表 + *

+ * + * @author lwh123 + * @since 2021-01-07 + */ +@Data +@TableName("casic_sanitation.dcms_car_job_record") +public class JobRecord extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "ID",type = IdType.ID_WORKER) + private Long id; + /** + * 车辆ID + */ + @TableField("CAR_ID") + private Long carId; + /** + * 路线ID + */ + @TableField("ROUTE_ID") + private Long routeId; + /** + * 开始时间 + */ + @TableField("START_TIME") + private Date startTime; + /** + * 结束时间 + */ + @TableField("END_TIME") + private Date endTime; + /** + * 创建时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 修改时间 + */ + @TableField("UPDATE_TIME") + private Date updateTime; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "JobRecord{" + + "id=" + id + + ", carId=" + carId + + ", routeId=" + routeId + + ", startTime=" + startTime + + ", endTime=" + endTime + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + "}"; + } +} diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/system/service/IJobSanitationSupportService.java b/casic-service-support/src/main/java/com/casic/missiles/modular/system/service/IJobSanitationSupportService.java index 1b8a60a..8b430e8 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/system/service/IJobSanitationSupportService.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/system/service/IJobSanitationSupportService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.model.JobRecord; import com.casic.missiles.modular.system.model.JobStatisticsDay; /** @@ -22,4 +23,10 @@ * @param statisticsDay 统计数据 */ void saveOrUpdateByCarIdAndRouteId(JobStatisticsDay statisticsDay); + + /** + * 根据时间保存修改作业记录 + * @param record 作业记录 + */ + void saveOrUpdateJobRecordByTime(JobRecord record); }