临港二期

liujun001
1 parent 4e50ae8e
Showing 15 changed files with 132 additions and 33 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/app/AppSignExceptionController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/dto/TakeKeyDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/KeyInfo.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignInV1.java
Bsth-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/key/location/LinggangKeyWorkLocationService.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -11,6 +11,7 @@ import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.service.BigViewServiceV1;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
@@ -51,6 +52,8 @@ public class AppSignExceptionController extends BaseController {
     private ISignInService signInService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Autowired
+    private BigViewServiceV1 bigViewServiceV1;
     @ApiOperation("酒测签到异常")
     @PostMapping("/sign/exception/list")
@@ -127,7 +130,11 @@ public class AppSignExceptionController extends BaseController {
             Optional<SignIn> optSign = signIns.stream().filter(s -> Objects.equals(s.getId(), r.getSignId())).findFirst();
             if (optSign.isPresent()) {
                 vo.setSignTime(optSign.get().getCreateTime());
-                vo.setSignStatus(optSign.get().getExType());
+                if (bigViewServiceV1.isSignStatusWineEnum(optSign.get())) {
+                    vo.setSignStatus(3);
+                } else {
+                    vo.setSignStatus(optSign.get().getExType());
+                }
                 vo.setAlcoholIntake(optSign.get().getAlcoholIntake());
                 if (schedulingSize > 0) {
@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.driver.NewDriver;
@@ -246,11 +247,13 @@ public class DssDriverController extends BaseController {
         CalDriverScheduling calDriverScheduling = signInServiceV1.findSchedulingByDateTime(dto.getStaffCode(), new Date(), 1);
         if(Objects.isNull(calDriverScheduling) || Objects.isNull(calDriverScheduling.getDriverScheduling()) || Objects.isNull(calDriverScheduling.getDriverScheduling().getSignInId())){
-            return ResponseResult.success(convertGetWineRecordVo(null));
+            return ResponseResult.success(convertGetWineRecordVo(null,null,null));
         }
+
+        Integer count = signInService.count(calDriverScheduling.getDriverScheduling().getId());
         SignIn dataSignIn = signInService.getById(calDriverScheduling.getDriverScheduling().getSignInId());
-        return ResponseResult.success(convertGetWineRecordVo(dataSignIn));
+        return ResponseResult.success(convertGetWineRecordVo(dataSignIn,calDriverScheduling.getDriverScheduling(),count));
     }
     @PostMapping(value = "/Info/GetBusPlanList")
@@ -627,19 +630,32 @@ public class DssDriverController extends BaseController {
         return new SignOutVo(dto.getDevice(), dto.getDriverCode(), dto.getLogoutTime(), vo.getId());
     }
-    private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
+    private GetWineRecordVo convertGetWineRecordVo(SignIn signIn, DriverScheduling scheduling,Integer count) {
         GetWineRecordVo vo = new GetWineRecordVo();
         if (Objects.isNull(signIn)) {
             vo.setCheck(true);
             return vo;
         }
         vo.setCheckTime(signIn.getCreateTime());
+        if(bigViewServiceV1.isSignStatusWineEnum(signIn)){
+            vo.setCheck(Boolean.TRUE);
+            return vo;
+        }
-        String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + signIn.getJobCode()+":"+signIn.getSchedulingId();
-
-        Integer count = redisCache.getCacheObject(key);
-        if (Objects.nonNull(count) && SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
-            vo.setCheck(Objects.equals(signIn.getType(), 0));
+        Integer total = Objects.isNull(scheduling)||Objects.isNull(scheduling.getAlcoholCount())?SIGN_IN_ERROR_COUNT:scheduling.getAlcoholCount();
+        if (Objects.isNull(count) || total.compareTo(count) >= 0) {
+            if(bigViewServiceV1.isSignStatusDelayEnum(signIn)){
+                vo.setCheck(Boolean.FALSE);
+                return vo;
+            }
+            vo.setCheck(!Objects.equals(signIn.getType(), 0));
+            return vo;
+        }else if(count >  total){
+            if(bigViewServiceV1.isSignStatusDelayEnum(signIn)){
+                vo.setCheck(Boolean.FALSE);
+                return vo;
+            }
+            vo.setCheck(!Objects.equals(signIn.getType(), 0));
             return vo;
         }
@@ -278,9 +278,34 @@ public class KeyBoxController extends BaseController {
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
         List<KeyInfo> keyInfos = null;
-        if (CollectionUtils.isNotEmpty(dto.getKeyItem())) {
-            Set<String> codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getKeyCode).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toSet());
-            keyInfos = keyInfoService.list(codes);
+//        if (CollectionUtils.isNotEmpty(dto.getKeyItem())) {
+//            Set<String> codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getKeyCode).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toSet());
+//            keyInfos = keyInfoService.list(codes);
+//        }
+
+        Set<String> nbbms = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getPlate).filter(obj -> StringUtils.isNotEmpty(obj)).collect(Collectors.toSet());
+        if (CollectionUtils.isNotEmpty(nbbms)) {
+            List<CarInfo> carInfos = carInfoService.list(nbbms);
+            if (CollectionUtils.isNotEmpty(nbbms)) {
+                Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).filter(obj -> StringUtils.isNotEmpty(obj)).collect(Collectors.toSet());
+                if (CollectionUtils.isNotEmpty(plateNums)) {
+                    keyInfos = keyInfoService.listPlateNums(plateNums);
+                    if(CollectionUtils.isNotEmpty(keyInfos)){
+                        keyInfos = keyInfos.stream().map(k->{
+                            Optional<CarInfo> optCar = carInfos.stream().filter(c->Objects.equals(k.getPlateNum(),c.getPlateNum())).findFirst();
+                            optCar.ifPresent(c->k.setNmmb(c.getNbbm()));
+
+                            return k;
+                        }).collect(Collectors.toList());
+                    }
+                }
+            }
+        }
+
+        Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
+        LinggangVenueInfo venueInfo = null;
+        if(Objects.nonNull(equipment)){
+            venueInfo = venueInfoService.getById(equipment.getYardId());
         }
         NewDriver driver = newDriverService.getOne(dto.getStaffCode());
@@ -289,12 +314,11 @@ public class KeyBoxController extends BaseController {
 //            return ResponseResult.error404();
 //        }
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 0);
-        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1,venueInfo);
+        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.saveAndDel(locations);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
         }
-        Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
         TakeKeyVo vo = convertTakeKeyVo(dto, responseResult, equipment);
@@ -328,21 +352,36 @@ public class KeyBoxController extends BaseController {
         }
         List<KeyInfo> keyInfos = null;
-        if (CollectionUtils.isNotEmpty(dto.getKeyItem())) {
-            Set<String> codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getKeyCode).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toSet());
-            keyInfos = keyInfoService.list(codes);
-            if (CollectionUtils.isEmpty(keyInfos)) {
-                codes = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getPlate).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toSet());
-                keyInfos = keyInfoService.list(null, codes);
+
+        Set<String> nbbms = dto.getKeyItem().stream().map(TakeKeyKeyItemDTO::getPlate).filter(obj -> StringUtils.isNotEmpty(obj)).collect(Collectors.toSet());
+        if (CollectionUtils.isNotEmpty(nbbms)) {
+            List<CarInfo> carInfos = carInfoService.list(nbbms);
+            if (CollectionUtils.isNotEmpty(nbbms)) {
+                Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).filter(obj -> StringUtils.isNotEmpty(obj)).collect(Collectors.toSet());
+                if (CollectionUtils.isNotEmpty(plateNums)) {
+                    keyInfos = keyInfoService.listPlateNums(plateNums);
+                    if(CollectionUtils.isNotEmpty(keyInfos)){
+                        keyInfos = keyInfos.stream().map(k->{
+                            Optional<CarInfo> optCar = carInfos.stream().filter(c->Objects.equals(k.getPlateNum(),c.getPlateNum())).findFirst();
+                            optCar.ifPresent(c->k.setNmmb(c.getNbbm()));
+
+                            return k;
+                        }).collect(Collectors.toList());
+                    }
+                }
             }
         }
-
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 1);
+        Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
+        LinggangVenueInfo venueInfo = null;
+        if(Objects.nonNull(equipment)){
+            venueInfo = venueInfoService.getById(equipment.getYardId());
+        }
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver, keyInfos, 0,venueInfo);
 //        List<LinggangKeyWorkLocation> errorLocations = locations.stream().filter(l -> Objects.isNull(l.getKeyInfoId())).collect(Collectors.toList());
 //        locations = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).collect(Collectors.toList());
-        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
+        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.saveAndDel(locations);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
         }
@@ -357,8 +396,6 @@ public class KeyBoxController extends BaseController {
 //            return ResponseResult.error(responseResult.getCode(), JSON.toJSONString(errorCode) + "归还失败，请归还到指定位置");
 //        }
-
-        Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
         TakeKeyVo vo = convertTakeKeyVo(dto, responseResult, equipment);
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
@@ -751,7 +788,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos, int ty) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings, NewDriver driver, List<KeyInfo> keyInfos, int ty,LinggangVenueInfo venueInfo) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -766,6 +803,7 @@ public class KeyBoxController extends BaseController {
             location.setPlate(item.getPlate());
             location.setTime(dto.getTime());
             location.setType1(ty);
+            location.setCabinetNo(item.getParkCode());
             location.setJobCode(dto.getStaffCode());
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
@@ -778,7 +816,7 @@ public class KeyBoxController extends BaseController {
                 if (optional.isPresent()) {
                     location.setKeyInfoId(optional.get().getId());
                 } else {
-                    optional = keyInfos.stream().filter(k -> Objects.equals(k.getPlateNum(), item.getPlate())).findFirst();
+                    optional = keyInfos.stream().filter(k -> Objects.equals(k.getNmmb(), item.getPlate())).findFirst();
                     if (optional.isPresent()) {
                         location.setKeyInfoId(optional.get().getId());
                     }
@@ -788,6 +826,11 @@ public class KeyBoxController extends BaseController {
             if (Objects.nonNull(driver)) {
                 location.setCreateBy(Convert.toLong(driver.getId()));
             }
+
+            if(Objects.nonNull(venueInfo)){
+                location.setYardId(venueInfo.getId());
+                location.setYardName(venueInfo.getName());
+            }
             location.setCreateTime(new Date());
             return location;
@@ -52,7 +52,7 @@ public class TakeKeyDTO implements java.io.Serializable {
 //    @NotEmpty(message = "选择的钥匙位车牌 不能为空")
 //    @ApiModelProperty(value = "选择的钥匙位车牌", required = true)
-//    private String plate;
+    private String plate;
     @ApiModelProperty(value = "领取钥匙信息集合")
     private List<TakeKeyKeyItemDTO> keyItem;
@@ -63,6 +63,9 @@ public class KeyInfo {
     @Excel(name = "钥匙编码")
     private java.lang.String keyCode;
+    @TableField(exist = false)
+    private String nmmb;
+
     @Override
     public String toString() {
@@ -118,6 +118,8 @@ public class SignInV1 {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+    private java.lang.Long schedulingId;
+
     /**
      * 备注
      */
@@ -106,4 +106,6 @@ public interface ISignInService extends IService&lt;SignIn&gt; {
      * @return int 0:未签到，1:已签到
      */
     int signOutType(NewDriver driver);
+
+    int count(Long scheduleId);
 }
@@ -413,6 +413,14 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         return 0;
     }
+    @Override
+    public int count(Long scheduleId) {
+        LambdaQueryWrapper<SignIn> countWrapper = new LambdaQueryWrapper<>();
+        countWrapper.select(SignIn::getId);
+        countWrapper.eq(SignIn::getSchedulingId,scheduleId);
+        return count(countWrapper);
+    }
+
     private String handleDate(String dateString) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
@@ -2,6 +2,7 @@ package com.ruoyi.in.service.impl;
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.ConstDriverProperties;
@@ -295,7 +296,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             signInResource.setCreateBy(Convert.toLong(signIn.getCreateBy()));
             signInResourceService.save(signInResource);
         }
-        signInV1.setId(signInV1.getId());
+        signInV1.setId(signIn.getId());
         // 更新考勤
         if (Objects.nonNull(calDriverScheduling)) {
             schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn, true, signInService);
@@ -305,6 +306,10 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             TempCache.updateSignStatus(signIn.getJobCode());
         }
+        LambdaUpdateWrapper<SignInV1> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(SignInV1::getSchedulingId, scheduling.getId());
+        updateWrapper.eq(SignInV1::getId, signIn.getId());
+        update(updateWrapper);
         // 异常保存到异常异常中
         threadJobService.asyncInsertExceptionRecord(signIn, driver, scheduling);
@@ -24,7 +24,8 @@ public class SchedulingServiceV1Impl extends ServiceImpl&lt;SchedulingMapperV1, Dri
         SchedulingDateEntity entity = switchSchedulingDate(date);
         wrapper.eq(DriverSchedulingV1::getJobCode, jobCode);
         wrapper.and(wr -> {
-            wr.eq(DriverSchedulingV1::getScheduleDate, date).or().between(DriverSchedulingV1::getFcsjT, entity.getStartDate().getTime(), entity.getEndDate().getTime());
+            String dateStr = DateUtils.YYYY_MM_DD.format(date);
+            wr.likeRight(DriverSchedulingV1::getScheduleDate, dateStr).or().between(DriverSchedulingV1::getFcsjT, entity.getStartDate().getTime(), entity.getEndDate().getTime());
         });
         wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
@@ -107,8 +107,10 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
         if (Objects.isNull(count) || count.equals(0)) {
             count = 1;
             redisCache.setCacheObject(key, count, 1, TimeUnit.DAYS);
+            redisCache.setCacheObject(key1, count, 1, TimeUnit.DAYS);
         } else {
             redisCache.setCacheObject(key, ++count, 1, TimeUnit.DAYS);
+            redisCache.setCacheObject(key1, count, 1, TimeUnit.DAYS);
         }
         if (driverScheduling.getAlcoholCount() - count <= 0) {
@@ -440,6 +440,12 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return ResponseResult.error(resultStr.toString());
     }
+    @Override
+    public ResponseResult<Boolean> saveAndDel(List<LinggangKeyWorkLocation> locations) {
+        boolean flag = saveBatch(locations);
+        return ResponseResult.success(flag);
+    }
+
     public boolean update(LinggangKeyWorkLocation location) {
         LambdaUpdateWrapper<LinggangKeyWorkLocation> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime, new Date())
@@ -77,6 +77,8 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
      */
      ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum);
+     ResponseResult<Boolean> saveAndDel(List<LinggangKeyWorkLocation> locations);
+
     boolean deleteById(Long id);
     boolean removeBySchedulingId(Set<Long> schedulingId );
@@ -101,8 +101,8 @@ spring:
     redis:
         # 地址
 #            host: 121.41.83.61
-        host: 192.168.168.124
-        database: 10
+        host: 192.168.169.100
+        database: 2
 #            password: "guzijian"
         port: 6379
         # 连接超时时间
@@ -172,6 +172,7 @@
             <if test="remark != null">remark,</if>
             <if test="exType != null">ex_type,</if>
             <if test="null!=schedulingId">scheduling_id,</if>
+            <if test="null!=exType1">ex_type1,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">#{createTime},</if>
@@ -189,6 +190,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="exType != null">#{exType},</if>
             <if test="null!=schedulingId">#{schedulingId,jdbcType=INTEGER},</if>
+            <if test="null!=exType1">#{exType1,jdbcType=INTEGER},</if>
         </trim>
     </insert>