Commit dac0b583035ff2f23c08967fdcdc790add97239b
1 parent
ff8c38b2
新增管理员取钥匙类型
优化推送酒精异常数据逻辑
Showing
3 changed files
with
18 additions
and
5 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
| ... | ... | @@ -2,6 +2,9 @@ package com.ruoyi.controller.dss; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.convert.Convert; |
| 4 | 4 | import com.alibaba.fastjson2.JSON; |
| 5 | +import com.baomidou.mybatisplus.core.conditions.Wrapper; | |
| 6 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
| 7 | +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |
| 5 | 8 | import com.baomidou.mybatisplus.core.metadata.IPage; |
| 6 | 9 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| 7 | 10 | import com.ruoyi.common.ConstDriverProperties; |
| ... | ... | @@ -26,6 +29,7 @@ import com.ruoyi.domain.venue.info.LinggangVenueInfo; |
| 26 | 29 | import com.ruoyi.equipment.domain.Equipment; |
| 27 | 30 | import com.ruoyi.equipment.service.IEquipmentService; |
| 28 | 31 | import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; |
| 32 | +import com.ruoyi.scheduling.domain.DriverSchedulingV1; | |
| 29 | 33 | import com.ruoyi.scheduling.domain.SchedulingDateEntity; |
| 30 | 34 | import com.ruoyi.scheduling.service.SchedulingServiceV1; |
| 31 | 35 | import com.ruoyi.service.carinfo.CarInfoService; |
| ... | ... | @@ -42,6 +46,7 @@ import io.swagger.annotations.ApiOperation; |
| 42 | 46 | import lombok.extern.slf4j.Slf4j; |
| 43 | 47 | import org.apache.commons.collections4.CollectionUtils; |
| 44 | 48 | import org.apache.commons.lang3.StringUtils; |
| 49 | +import org.apache.commons.lang3.time.DateFormatUtils; | |
| 45 | 50 | import org.springframework.beans.BeanUtils; |
| 46 | 51 | import org.springframework.beans.factory.annotation.Autowired; |
| 47 | 52 | import org.springframework.validation.BindingResult; |
| ... | ... | @@ -326,11 +331,20 @@ public class KeyBoxController extends BaseController { |
| 326 | 331 | // 转换并处理领取钥匙的位置信息 |
| 327 | 332 | List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1, venueInfo); |
| 328 | 333 | |
| 334 | + System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>"); | |
| 329 | 335 | //如果是管理员操作改变排班表的exType=3 |
| 330 | 336 | if (dto.getOpeType()==16) { |
| 331 | - LinggangScheduling scheduling = schedulingService.getById(locations.get(0).getSchedulingId()); | |
| 332 | - scheduling.setExType(4); | |
| 333 | - schedulingService.updateById(scheduling); | |
| 337 | + String date = DateFormatUtils.format(DateUtils.getNowDate(),"yyyy-MM-dd"); | |
| 338 | + LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(); | |
| 339 | + wrapper.eq(LinggangScheduling::getNbbm,dto.getKeyItem().get(0).getPlate()).and(i -> i.and(j -> j.ge(LinggangScheduling::getScheduleDate, DateUtils.dateTime("yyyy-MM-dd",date)))) | |
| 340 | + .and(i -> i.eq(LinggangScheduling::getBcType,"out")).and(i -> i.eq(LinggangScheduling::getPosts,"驾驶员")).last("ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 1000)") | |
| 341 | + .last("limit 1"); | |
| 342 | + List<LinggangScheduling> scheduling = schedulingService.list(wrapper); | |
| 343 | + if(!scheduling.isEmpty()){ | |
| 344 | + scheduling.get(0).setExType(4); | |
| 345 | + scheduling.get(0).setRemark("管理员代领钥匙"); | |
| 346 | + schedulingService.updateById(scheduling.get(0)); | |
| 347 | + } | |
| 334 | 348 | } |
| 335 | 349 | |
| 336 | 350 | ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.saveAndDel(locations); | ... | ... |
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
Bsth-admin/src/main/resources/application-druid-lingangPrd.yml
| ... | ... | @@ -163,8 +163,6 @@ mybatis-plus: |
| 163 | 163 | mapperLocations: classpath*:mapper/**/*Mapper.xml |
| 164 | 164 | # 加载全局的配置文件 |
| 165 | 165 | configLocation: classpath:mybatis/mybatis-config.xml |
| 166 | - configuration: | |
| 167 | - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl | |
| 168 | 166 | # Swagger配置 |
| 169 | 167 | swagger: |
| 170 | 168 | # 是否开启swagger | ... | ... |