归还钥匙、领取钥匙使用车辆自编号

liujun001
1 parent 1c59a038
Showing 11 changed files with 185 additions and 94 deletions
Bsth-admin/pom.xml
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/resource/LinggangSignInResourceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/sign/in/resource/LinggangSignInResourceService.java
Bsth-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
Bsth-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
Bsth-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -148,6 +148,12 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.sourceforge.tess4j</groupId>
+            <artifactId>tess4j</artifactId>
+            <version>5.9.0</version>
+        </dependency>
+
     </dependencies>
     <build>
 package com.ruoyi.driver.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.global.Result;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.pojo.request.DriverRequestVo;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
@@ -13,20 +16,15 @@ import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.driver.domain.Driver;
-import com.ruoyi.driver.service.IDriverService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * 驾驶员信息Controller
  *
@@ -68,7 +66,11 @@ public class DriverController extends BaseController {
     public TableDataInfo list(DriverRequestVo driver) {
         startPage();
         List<Driver> list = driverService.selectDriverList(driver);
-        return getDataTable(list);
+        TableDataInfo dataInfo = getDataTable(list);
+
+        driverService.combInfo(list);
+
+        return dataInfo;
     }
 package com.ruoyi.driver.service;
-import java.io.IOException;
-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
@@ -16,6 +13,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 /**
  * 驾驶员信息Service接口
@@ -43,6 +42,8 @@ public interface IDriverService  extends IService&lt;Driver&gt;
     List<Driver> selectDriverIdJobCodePersonnelName(Driver driver);
+    List<Driver> combInfo(List<Driver> lists);
+
     /**
      * 新增驾驶员信息
      * 
@@ -45,7 +45,7 @@ import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -149,29 +149,27 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     public List<Driver> selectDriverList(DriverRequestVo driver) {
         List<Driver> drivers = driverMapper.selectDriverList(driver);
-        SysDictData source = new SysDictData();
-        source.setDictType("resource_base_url");
-        List<SysDictData> sysDictDatas = sysDictDataService.queryDictDateList(source);
-
-        String url1 = "";
-        String flag1 = null;
+        return drivers;
+    }
-        if (CollectionUtils.isNotEmpty(sysDictDatas)) {
-            for (SysDictData s : sysDictDatas) {
-                if (Objects.equals(s.getDiscKey(), "resource_base_url")) {
-                    url1 = s.getDictValueStr();
-                    continue;
-                }
+    @Override
+    public List<Driver> selectDriverIdJobCodePersonnelName(Driver driver) {
+        driver.setParams(null);
+        LambdaQueryWrapper<Driver> wrapper = new LambdaQueryWrapper<>(driver);
+        wrapper.select(Driver::getId, Driver::getJobCode, Driver::getPersonnelName);
+        return list(wrapper);
+    }
-                if (org.apache.commons.lang3.StringUtils.equals(s.getDiscKey(), "resource_base_url_flag")) {
-                    flag1 = s.getDictValueStr();
-                    continue;
-                }
-            }
+    @Override
+    public List<Driver> combInfo(List<Driver> drivers) {
+        if (CollectionUtils.isEmpty(drivers)) {
+            return drivers;
         }
+        SysDictData source = sysDictDataService.getResourceBaseUrl();
+
+
+        String url = source.getDictValueStr();
-        String url = url1;
-        String flag = flag1;
         List<EquipmentDriverExpand> list = equipmentMapper.querySignListByJobCode(drivers);
         for (Driver item : drivers) {
@@ -179,29 +177,16 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
             List<String> collect = list.stream().filter(todo -> item.getJobCode().equals(todo.getJobCode())).map(EquipmentDriverExpand::getDeviceId).collect(Collectors.toList());
             item.setSignInEquipment(StringUtils.join(collect));
         }
-        if (org.apache.commons.lang3.StringUtils.equals("1", flag)) {
+        if (source.isCombationVal()) {
             drivers = drivers.stream().map(d -> {
-                String fil = "/";
-                if (org.apache.commons.lang3.StringUtils.startsWith(d.getImage(), "/") || org.apache.commons.lang3.StringUtils.startsWith(d.getImage(), "\\")) {
-                    fil = "";
-                } else if (org.apache.commons.lang3.StringUtils.endsWith(url, "/")) {
-                    fil = "";
-                }
-                d.setImage(org.apache.commons.lang3.StringUtils.join(url, fil, d.getImage()));
+                d.setImage(sysDictDataService.combationValue(d.getImage(),source));
                 return d;
             }).collect(Collectors.toList());
+            return drivers;
         }
-        return drivers;
-    }
-
-    @Override
-    public List<Driver> selectDriverIdJobCodePersonnelName(Driver driver) {
-        driver.setParams(null);
-        LambdaQueryWrapper<Driver> wrapper = new LambdaQueryWrapper<>(driver);
-        wrapper.select(Driver::getId, Driver::getJobCode, Driver::getPersonnelName);
-        return list(wrapper);
+        return null;
     }
     private DriverSignInRecommendation checkTime(List<DriverScheduling> dto, Long now) {
 package com.ruoyi.in.controller;
-import java.io.IOException;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.response.SignInResponseVo;
+import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
+import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.in.service.ISignInService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 /**
  * 签到Controller
@@ -41,6 +43,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class SignInController extends BaseController {
     @Autowired
     private ISignInService signInService;
+    @Autowired
+    private LinggangSignInResourceService signInResourceService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
     /**
      * 查询签到列表
@@ -51,7 +57,26 @@ public class SignInController extends BaseController {
     public TableDataInfo list(SignInResponseVo signIn) {
         startPage();
         List<SignInResponseVo> list = signInService.selectSignInList(signIn);
-        return getDataTable(list);
+        TableDataInfo tableDataInfo = getDataTable(list);
+        if (CollectionUtils.isNotEmpty(list)) {
+            Set<Long> ids = list.stream().map(SignInResponseVo::getId).collect(Collectors.toSet());
+            SysDictData source = sysDictDataService.getResourceBaseUrl();
+            List<LinggangSignInResource> resources = signInResourceService.listBySignIds(ids);
+            if (CollectionUtils.isNotEmpty(resources)) {
+                resources.stream().forEach(r -> {
+                    Optional<SignInResponseVo> optVo = list.stream().filter(l -> Objects.equals(l.getId(), r.getSignId())).findFirst();
+                    if (optVo.isPresent()) {
+                        if (Objects.equals(r.getResourceType(), 2)) {
+                            optVo.get().setVideoURL(sysDictDataService.combationValue(r.getPath(), source));
+                        } else {
+                            optVo.get().setImage(sysDictDataService.combationValue(r.getPath(), source));
+                        }
+                    }
+                });
+            }
+        }
+
+        return tableDataInfo;
     }
     /**
@@ -123,14 +148,13 @@ public class SignInController extends BaseController {
 //    public AjaxResult remove(@PathVariable Long[] ids) {
 //        return toAjax(signInService.deleteSignInByIds(ids));
 //    }
-
     @GetMapping("/repair")
-    public AjaxResult repairSignRecord(HttpServletRequest request){
+    public AjaxResult repairSignRecord(HttpServletRequest request) {
         return AjaxResult.success(signInService.repairSignRecord(request));
     }
     @GetMapping("/repairAll/{date}")
-    public AjaxResult repairAllSignRecord(HttpServletRequest request,@PathVariable("date") String date){
-        return AjaxResult.success(signInService.repairAllSignRecord(request,date));
+    public AjaxResult repairAllSignRecord(HttpServletRequest request, @PathVariable("date") String date) {
+        return AjaxResult.success(signInService.repairAllSignRecord(request, date));
     }
 }
@@ -26,6 +26,9 @@ public class SignInResponseVo extends SignIn {
      */
     String date;
+    @ExcelIgnore
+    private String VideoURL;
+
     public SignInResponseVo(SignIn signIn){
         this.setDeviceId(signIn.getDeviceId());
@@ -19,10 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 @Slf4j
@@ -65,6 +62,17 @@ public class LinggangSignInResourceServiceImpl extends ServiceImpl&lt;LinggangSignI
     public List<LinggangSignInResource> list(LinggangSignInResource entity) {
         return list(new LambdaQueryWrapper<>(entity));
     }
+
+    @Override
+    public List<LinggangSignInResource> listBySignIds(Collection<Long> signIds) {
+        if (CollectionUtils.isEmpty(signIds)) {
+            return Collections.emptyList();
+        }
+
+        LambdaQueryWrapper<LinggangSignInResource> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(LinggangSignInResource::getSignId, signIds);
+        return list(wrapper);
+    }
     // @Override
     // public List<LinggangSignInResource> listOfSelect(LinggangSignInResource entity) {
     //      LambdaQueryWrapper<LinggangSignInResource> wrapper = new LambdaQueryWrapper<>(entity);
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
+import java.util.Collection;
 import java.util.List;
@@ -22,6 +23,8 @@ public interface LinggangSignInResourceService extends IService&lt;LinggangSignInRe
      */
     List<LinggangSignInResource> list(LinggangSignInResource entity);
+    List<LinggangSignInResource> listBySignIds(Collection<Long> signIds);
+
     // List<LinggangSignInResource> listOfIds(java.util.Collection<java.lang.Long> ids);
     // /***
     // *用于页面选择
@@ -169,6 +169,10 @@ public class SysDictData extends BaseEntity {
         this.discKey = discKey;
     }
+    public  boolean isCombationVal(){
+      return   org.apache.commons.lang3.StringUtils.equals("1", getStatus());
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 package com.ruoyi.system.service;
-import java.util.Collection;
-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 字典 业务层
  *
@@ -26,6 +26,10 @@ public interface ISysDictDataService extends IService&lt;SysDictData&gt; {
     SysDictData getOne(SysDictData sysDictData);
+    SysDictData getResourceBaseUrl();
+
+    String combationValue(String url,SysDictData dictData);
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *
 package com.ruoyi.system.service.impl;
-import java.util.Collection;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.service.ISysDictDataService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 /**
  * 字典 业务层处理
@@ -55,6 +57,55 @@ public class SysDictDataServiceImpl extends ServiceImpl&lt;SysDictDataMapper, SysDi
         return getOne(wrapper);
     }
+    @Override
+    public SysDictData getResourceBaseUrl() {
+        SysDictData source = new SysDictData();
+        source.setDictType("resource_base_url");
+        List<SysDictData> sysDictDatas = queryDictDateList(source);
+
+        String url1 = "";
+        String flag1 = null;
+
+        if (CollectionUtils.isNotEmpty(sysDictDatas)) {
+            for (SysDictData s : sysDictDatas) {
+                if (Objects.equals(s.getDiscKey(), "resource_base_url")) {
+                    url1 = s.getDictValueStr();
+                    continue;
+                }
+
+                if (org.apache.commons.lang3.StringUtils.equals(s.getDiscKey(), "resource_base_url_flag")) {
+                    flag1 = s.getDictValueStr();
+                    continue;
+                }
+            }
+        }
+
+        SysDictData target = new SysDictData();
+        target.setDictValue(url1);
+        target.setStatus(flag1);
+
+        return target;
+    }
+
+    @Override
+    public String combationValue(String url, SysDictData dictData) {
+        if (Objects.isNull(dictData) || StringUtils.isEmpty(url)) {
+            return url;
+        }
+
+        if (dictData.isCombationVal()) {
+            String fil = "/";
+
+            if (org.apache.commons.lang3.StringUtils.startsWith(url, "/") || org.apache.commons.lang3.StringUtils.startsWith(url, "\\")) {
+                fil = "";
+            } else if (org.apache.commons.lang3.StringUtils.endsWith(dictData.getDictValueStr(), "/")) {
+                fil = "";
+            }
+            return org.apache.commons.lang3.StringUtils.join(dictData.getDictValueStr(), fil, url);
+        }
+        return url;
+    }
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *