diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java index bba40fa..859153d 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java @@ -26,6 +26,8 @@ public static final String START_DATE_COL = "START_DATE"; public static final String END_DATE_COL = "END_DATE"; public static final String ROUTE_ID_COL = "ROUTE_ID"; + public static final String SANITATION_SYS_CODE = "1"; + public static final String SANITATION_SYS_COL = "SYS"; /** * 线段必须覆盖比值 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java index bba40fa..859153d 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java @@ -26,6 +26,8 @@ public static final String START_DATE_COL = "START_DATE"; public static final String END_DATE_COL = "END_DATE"; public static final String ROUTE_ID_COL = "ROUTE_ID"; + public static final String SANITATION_SYS_CODE = "1"; + public static final String SANITATION_SYS_COL = "SYS"; /** * 线段必须覆盖比值 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java index d051c70..54565fc 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.position.dto.CarPositionDto; import com.casic.missiles.modular.position.es.BusCarPosition; import com.casic.missiles.modular.position.service.IBusCarPositionService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,8 @@ private IBusCarInfoSupportService carInfoSupportService; @Autowired private IBusCarPositionService busCarPositionService; + @Autowired + private ISanitationCarService carService; /** * 跟踪（查询车辆最新位置） */ @@ -40,4 +43,12 @@ carPositionDto.setStatus(busCarPositionService.getCarStatus(positionInfo)); return ResponseData.success(carPositionDto); } + /** + * 跟踪（查询车辆最新位置） + */ + @RequestMapping("/task") + public Object task(){ + carService.trackInspection(); + return ResponseData.success(); + } } diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java index bba40fa..859153d 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java @@ -26,6 +26,8 @@ public static final String START_DATE_COL = "START_DATE"; public static final String END_DATE_COL = "END_DATE"; public static final String ROUTE_ID_COL = "ROUTE_ID"; + public static final String SANITATION_SYS_CODE = "1"; + public static final String SANITATION_SYS_COL = "SYS"; /** * 线段必须覆盖比值 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java index d051c70..54565fc 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.position.dto.CarPositionDto; import com.casic.missiles.modular.position.es.BusCarPosition; import com.casic.missiles.modular.position.service.IBusCarPositionService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,8 @@ private IBusCarInfoSupportService carInfoSupportService; @Autowired private IBusCarPositionService busCarPositionService; + @Autowired + private ISanitationCarService carService; /** * 跟踪（查询车辆最新位置） */ @@ -40,4 +43,12 @@ carPositionDto.setStatus(busCarPositionService.getCarStatus(positionInfo)); return ResponseData.success(carPositionDto); } + /** + * 跟踪（查询车辆最新位置） + */ + @RequestMapping("/task") + public Object task(){ + carService.trackInspection(); + return ResponseData.success(); + } } 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 169a86c..3b593fc 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 @@ -20,8 +20,8 @@ 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.JobStatisticsDay; -import com.casic.missiles.modular.system.service.ISanitationCarService; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -77,8 +77,9 @@ EntityWrapper routeQuery = new EntityWrapper(); query.gt(StrategyAlarmConst.START_DATE_COL, currTime); query.lt(StrategyAlarmConst.END_DATE_COL, currTime); - query.eq(StrategyAlarmConst.ROUTE_ID_COL, busCarInfo.getId()); - List busRouteInfos = routeInfoSupportService.seleceByCar(routeQuery); + + query.eq(StrategyAlarmConst.SANITATION_SYS_COL, StrategyAlarmConst.SANITATION_SYS_CODE); + List busRouteInfos = routeInfoSupportService.seleceByCar(routeQuery, busCarInfo.getId()); if (CollectionUtils.isEmpty(busRouteInfos)) { //车辆未绑定路线 环卫不再进行判断 continue; @@ -102,15 +103,28 @@ for (List times : tims) { //获取当前时段信息 Map map = getStartAndEndTime(times); + Long carId = busCarInfo.getId(); + if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(105))){ + carId = 5L; + } //获取规定时间内 车辆定位数据 - List carPositions = carPositionSupportService.selectHistoryCarPosition(busCarInfo.getId(), map.get("start"), map.get("end")); + List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); sets.addAll(context.execStrategy(alarmProcessDTO)); System.out.println("车辆定位点信息:" + sets); } - processJobResult(sets, alarmProcessDTO, currTime); +// processJobResult(sets, alarmProcessDTO, currTime); + //作业统计类创建 + JobStatisticsDay statisticsDay = new JobStatisticsDay(); + statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + statisticsDay.setCreateTime(new Date()); + statisticsDay.setCurrDay(currTime); + statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + statisticsDay.setCount(sets.stream().collect(Collectors.summingInt(ResultStatus::getNum))); + jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay); } + } } @@ -120,14 +134,7 @@ * @param statusSet */ private void processJobResult(Set statusSet, AlarmProcessDTO alarmProcessDTO, String currTime) { - //作业统计类创建 - JobStatisticsDay statisticsDay = new JobStatisticsDay(); - statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); - statisticsDay.setCreateTime(new Date()); - statisticsDay.setCurrDay(currTime); - statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); - statisticsDay.setCount(statusSet.stream().collect(Collectors.summingInt(ResultStatus::getNum))); - jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay); + } /** diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java index bba40fa..859153d 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java @@ -26,6 +26,8 @@ public static final String START_DATE_COL = "START_DATE"; public static final String END_DATE_COL = "END_DATE"; public static final String ROUTE_ID_COL = "ROUTE_ID"; + public static final String SANITATION_SYS_CODE = "1"; + public static final String SANITATION_SYS_COL = "SYS"; /** * 线段必须覆盖比值 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java index d051c70..54565fc 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.position.dto.CarPositionDto; import com.casic.missiles.modular.position.es.BusCarPosition; import com.casic.missiles.modular.position.service.IBusCarPositionService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,8 @@ private IBusCarInfoSupportService carInfoSupportService; @Autowired private IBusCarPositionService busCarPositionService; + @Autowired + private ISanitationCarService carService; /** * 跟踪（查询车辆最新位置） */ @@ -40,4 +43,12 @@ carPositionDto.setStatus(busCarPositionService.getCarStatus(positionInfo)); return ResponseData.success(carPositionDto); } + /** + * 跟踪（查询车辆最新位置） + */ + @RequestMapping("/task") + public Object task(){ + carService.trackInspection(); + return ResponseData.success(); + } } 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 169a86c..3b593fc 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 @@ -20,8 +20,8 @@ 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.JobStatisticsDay; -import com.casic.missiles.modular.system.service.ISanitationCarService; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -77,8 +77,9 @@ EntityWrapper routeQuery = new EntityWrapper(); query.gt(StrategyAlarmConst.START_DATE_COL, currTime); query.lt(StrategyAlarmConst.END_DATE_COL, currTime); - query.eq(StrategyAlarmConst.ROUTE_ID_COL, busCarInfo.getId()); - List busRouteInfos = routeInfoSupportService.seleceByCar(routeQuery); + + query.eq(StrategyAlarmConst.SANITATION_SYS_COL, StrategyAlarmConst.SANITATION_SYS_CODE); + List busRouteInfos = routeInfoSupportService.seleceByCar(routeQuery, busCarInfo.getId()); if (CollectionUtils.isEmpty(busRouteInfos)) { //车辆未绑定路线 环卫不再进行判断 continue; @@ -102,15 +103,28 @@ for (List times : tims) { //获取当前时段信息 Map map = getStartAndEndTime(times); + Long carId = busCarInfo.getId(); + if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(105))){ + carId = 5L; + } //获取规定时间内 车辆定位数据 - List carPositions = carPositionSupportService.selectHistoryCarPosition(busCarInfo.getId(), map.get("start"), map.get("end")); + List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); sets.addAll(context.execStrategy(alarmProcessDTO)); System.out.println("车辆定位点信息:" + sets); } - processJobResult(sets, alarmProcessDTO, currTime); +// processJobResult(sets, alarmProcessDTO, currTime); + //作业统计类创建 + JobStatisticsDay statisticsDay = new JobStatisticsDay(); + statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + statisticsDay.setCreateTime(new Date()); + statisticsDay.setCurrDay(currTime); + statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + statisticsDay.setCount(sets.stream().collect(Collectors.summingInt(ResultStatus::getNum))); + jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay); } + } } @@ -120,14 +134,7 @@ * @param statusSet */ private void processJobResult(Set statusSet, AlarmProcessDTO alarmProcessDTO, String currTime) { - //作业统计类创建 - JobStatisticsDay statisticsDay = new JobStatisticsDay(); - statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); - statisticsDay.setCreateTime(new Date()); - statisticsDay.setCurrDay(currTime); - statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); - statisticsDay.setCount(statusSet.stream().collect(Collectors.summingInt(ResultStatus::getNum))); - jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay); + } /** 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 ce7fb7d..5e62176 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 @@ -6,6 +6,7 @@ import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @ClassName JobSupportServiceImpl @@ -25,6 +26,7 @@ return jobStatisticsDayService.insert(entity); } + @Transactional(rollbackFor = Exception.class) @Override public void saveOrUpdateByCarIdAndRouteId(JobStatisticsDay statisticsDay) { EntityWrapper query = new EntityWrapper(); @@ -34,7 +36,10 @@ JobStatisticsDay queryRes = jobStatisticsDayService.selectOne(query); if (queryRes != null) { statisticsDay.setId(queryRes.getId()); + this.jobStatisticsDayService.updateById(statisticsDay); + } else { + this.save(statisticsDay); } - this.jobStatisticsDayService.insertOrUpdate(statisticsDay); + } } diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java index bba40fa..859153d 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/consts/StrategyAlarmConst.java @@ -26,6 +26,8 @@ public static final String START_DATE_COL = "START_DATE"; public static final String END_DATE_COL = "END_DATE"; public static final String ROUTE_ID_COL = "ROUTE_ID"; + public static final String SANITATION_SYS_CODE = "1"; + public static final String SANITATION_SYS_COL = "SYS"; /** * 线段必须覆盖比值 */ diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java index d051c70..54565fc 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/controller/CarPositionController.java @@ -7,6 +7,7 @@ import com.casic.missiles.modular.position.dto.CarPositionDto; import com.casic.missiles.modular.position.es.BusCarPosition; import com.casic.missiles.modular.position.service.IBusCarPositionService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,8 @@ private IBusCarInfoSupportService carInfoSupportService; @Autowired private IBusCarPositionService busCarPositionService; + @Autowired + private ISanitationCarService carService; /** * 跟踪（查询车辆最新位置） */ @@ -40,4 +43,12 @@ carPositionDto.setStatus(busCarPositionService.getCarStatus(positionInfo)); return ResponseData.success(carPositionDto); } + /** + * 跟踪（查询车辆最新位置） + */ + @RequestMapping("/task") + public Object task(){ + carService.trackInspection(); + return ResponseData.success(); + } } 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 169a86c..3b593fc 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 @@ -20,8 +20,8 @@ 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.JobStatisticsDay; -import com.casic.missiles.modular.system.service.ISanitationCarService; import com.casic.missiles.modular.system.service.IJobSanitationSupportService; +import com.casic.missiles.modular.system.service.ISanitationCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -77,8 +77,9 @@ EntityWrapper routeQuery = new EntityWrapper(); query.gt(StrategyAlarmConst.START_DATE_COL, currTime); query.lt(StrategyAlarmConst.END_DATE_COL, currTime); - query.eq(StrategyAlarmConst.ROUTE_ID_COL, busCarInfo.getId()); - List busRouteInfos = routeInfoSupportService.seleceByCar(routeQuery); + + query.eq(StrategyAlarmConst.SANITATION_SYS_COL, StrategyAlarmConst.SANITATION_SYS_CODE); + List busRouteInfos = routeInfoSupportService.seleceByCar(routeQuery, busCarInfo.getId()); if (CollectionUtils.isEmpty(busRouteInfos)) { //车辆未绑定路线 环卫不再进行判断 continue; @@ -102,15 +103,28 @@ for (List times : tims) { //获取当前时段信息 Map map = getStartAndEndTime(times); + Long carId = busCarInfo.getId(); + if(busCarInfo.getId().equals(new Long(9))&&busRouteInfo.getId().equals(new Long(105))){ + carId = 5L; + } //获取规定时间内 车辆定位数据 - List carPositions = carPositionSupportService.selectHistoryCarPosition(busCarInfo.getId(), map.get("start"), map.get("end")); + List carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end")); alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions); sets.addAll(context.execStrategy(alarmProcessDTO)); System.out.println("车辆定位点信息:" + sets); } - processJobResult(sets, alarmProcessDTO, currTime); +// processJobResult(sets, alarmProcessDTO, currTime); + //作业统计类创建 + JobStatisticsDay statisticsDay = new JobStatisticsDay(); + statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); + statisticsDay.setCreateTime(new Date()); + statisticsDay.setCurrDay(currTime); + statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); + statisticsDay.setCount(sets.stream().collect(Collectors.summingInt(ResultStatus::getNum))); + jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay); } + } } @@ -120,14 +134,7 @@ * @param statusSet */ private void processJobResult(Set statusSet, AlarmProcessDTO alarmProcessDTO, String currTime) { - //作业统计类创建 - JobStatisticsDay statisticsDay = new JobStatisticsDay(); - statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId()); - statisticsDay.setCreateTime(new Date()); - statisticsDay.setCurrDay(currTime); - statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId()); - statisticsDay.setCount(statusSet.stream().collect(Collectors.summingInt(ResultStatus::getNum))); - jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay); + } /** 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 ce7fb7d..5e62176 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 @@ -6,6 +6,7 @@ import com.casic.missiles.modular.system.service.IJobSanitationSupportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @ClassName JobSupportServiceImpl @@ -25,6 +26,7 @@ return jobStatisticsDayService.insert(entity); } + @Transactional(rollbackFor = Exception.class) @Override public void saveOrUpdateByCarIdAndRouteId(JobStatisticsDay statisticsDay) { EntityWrapper query = new EntityWrapper(); @@ -34,7 +36,10 @@ JobStatisticsDay queryRes = jobStatisticsDayService.selectOne(query); if (queryRes != null) { statisticsDay.setId(queryRes.getId()); + this.jobStatisticsDayService.updateById(statisticsDay); + } else { + this.save(statisticsDay); } - this.jobStatisticsDayService.insertOrUpdate(statisticsDay); + } } diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 1fb65c0..3c763c8 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -25,11 +25,11 @@ ################### mybatis-plus配置 ################### ################### guns配置 ################### elasticjob: - enabled: true + enabled: false reg-center: serverLists: localhost:2181 namespace: elasticjob-lite-springboot -# digest: admin:Casic203 + digest: admin:Casic203 casic: swagger-open: false #是否开启swagger (true/false) kaptcha-open: false #是否开启登录时验证码 (true/false)