新增管理员取钥匙类型

优化推送酒精异常数据逻辑

新增管理员取钥匙类型
优化推送酒精异常数据逻辑
2c
1 parent ff8c38b2
Showing 3 changed files with 18 additions and 5 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
Bsth-admin/src/main/resources/application-druid-lingangPrd.yml
@@ -2,6 +2,9 @@ package com.ruoyi.controller.dss;
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.ConstDriverProperties;
@@ -26,6 +29,7 @@ import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.scheduling.domain.DriverSchedulingV1;
 import com.ruoyi.scheduling.domain.SchedulingDateEntity;
 import com.ruoyi.scheduling.service.SchedulingServiceV1;
 import com.ruoyi.service.carinfo.CarInfoService;
@@ -42,6 +46,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -326,11 +331,20 @@ public class KeyBoxController extends BaseController {
         // 转换并处理领取钥匙的位置信息
         List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1, venueInfo);
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>");
         //如果是管理员操作改变排班表的exType=3
         if (dto.getOpeType()==16) {
-            LinggangScheduling scheduling = schedulingService.getById(locations.get(0).getSchedulingId());
-            scheduling.setExType(4);
-            schedulingService.updateById(scheduling);
+            String date = DateFormatUtils.format(DateUtils.getNowDate(),"yyyy-MM-dd");
+            LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(LinggangScheduling::getNbbm,dto.getKeyItem().get(0).getPlate()).and(i -> i.and(j -> j.ge(LinggangScheduling::getScheduleDate, DateUtils.dateTime("yyyy-MM-dd",date))))
+                    .and(i -> i.eq(LinggangScheduling::getBcType,"out")).and(i -> i.eq(LinggangScheduling::getPosts,"驾驶员")).last("ORDER BY ABS(fcsj_t - UNIX_TIMESTAMP() * 1000)")
+                    .last("limit 1");
+            List<LinggangScheduling> scheduling = schedulingService.list(wrapper);
+            if(!scheduling.isEmpty()){
+                scheduling.get(0).setExType(4);
+                scheduling.get(0).setRemark("管理员代领钥匙");
+                schedulingService.updateById(scheduling.get(0));
+            }
         }
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.saveAndDel(locations);
@@ -524,6 +524,7 @@ public class BigViewServiceImpl implements BigViewService {
                     break;
                 case 4:
                     personInfoVo.setSignStatus(SIGN_STATUS_FOUR_ENUM);
+                    break;
             }
         }
         // 设置工作编号和姓名
@@ -163,8 +163,6 @@ mybatis-plus:
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
-    configuration:
-        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 # Swagger配置
 swagger:
     # 是否开启swagger