guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PatrolTaskServiceImpl.java
@@ -188,9 +188,8 @@ } taskDetail.setStatus(2); taskDetailService.updateById(taskDetail); PatrolTask patrolTask = this.selectById(taskDetail.getPatrolTaskId()); if(!patrolTask.getImageModel().equals(ImageModelEnum.CONSTRUCTION_WASTE_LOAD.getCode())){ //获取所有在线车船 //2018年协议车辆在线 List<VehicleOnline> vehicleOnlines2018 = VideoGateway.queryRuntimeInfoByCache(0); @@ -269,8 +268,7 @@ taskDetailVehicle.setTerminalId(vehicleOnline1.getTerminalId()); taskDetailVehicle.setStatus(2); taskDetailVehiclesService.updateById(taskDetailVehicle); //非倾倒模型，建筑垃圾倾倒模型由网关接口触发判断执行结果 if(!patrolTask.getImageModel().equals(ImageModelEnum.CONSTRUCTION_WASTE_LOAD.getCode())){ //成功 List<TaskDetailVehiclesChannel> taskDetailVehiclesChannels = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>().eq("task_detail_vehicles_id", taskDetailVehicleId)); //开始发送拍照指令，获取照片地址 @@ -328,7 +326,6 @@ taskDetailVehicle.setEndExecutionTime(LocalDateTime.now()); taskDetailVehicle.setStatus(3); taskDetailVehiclesService.updateById(taskDetailVehicle); } }catch (Exception e){ e.printStackTrace(); //失败 @@ -352,6 +349,8 @@ taskDetailService.updateById(taskDetail); } } /** * 变更车辆状态 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -86,11 +86,12 @@ */ @Override public void delTaskDetail(List<String> ids) { this.baseMapper.deleteBatchIds(ids); List<TaskDetail> taskDetails = this.selectBatchIds(ids); for (TaskDetail taskDetail : taskDetails) { JobKey jobKey = new JobKey(taskDetail.getId().toString()); quartzUtil.deleteQuartzTask(jobKey); taskDetail.setDelFlag(1); this.updateById(taskDetail); } }
@@ -45,23 +45,23 @@ --- spring: datasource: url: jdbc:mysql://127.0.0.1:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 db-name: vehicle_inspection #用来搜集数据库的所有表 filters: wall,mergeStat #线上环境 #spring: # datasource: # url: jdbc:mysql://rm-m5e57gbu0gdv901ub.mysql.rds.aliyuncs.com:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai # username: vehicleInspection # password: SYzt1953123456 # db-name: guns #用来搜集数据库的所有表 # url: jdbc:mysql://127.0.0.1:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai # username: root # password: 123456 # db-name: vehicle_inspection #用来搜集数据库的所有表 # filters: wall,mergeStat #线上环境 spring: datasource: url: jdbc:mysql://rm-m5e57gbu0gdv901ub.mysql.rds.aliyuncs.com:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: vehicleInspection password: SYzt1953123456 db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat #多数据源情况的配置 guns:
